From b28d0461b47a8c607aabe437bdca703ee7619014 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 8 Nov 2011 21:00:52 +0100
Subject: 32bit build fixed, broken by a previous commit fixing build on
 Solaris

---
 deps/lua/Makefile     | 2 +-
 deps/lua/src/Makefile | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'deps/lua')

diff --git a/deps/lua/Makefile b/deps/lua/Makefile
index eed4aedc4..6e78f66fa 100644
--- a/deps/lua/Makefile
+++ b/deps/lua/Makefile
@@ -53,7 +53,7 @@ R= 5.1.4
 all:	$(PLAT)
 
 $(PLATS) clean:
-	cd src && $(MAKE) ARCH="$(ARCH)" $@
+	cd src && $(MAKE) $@
 
 test:	dummy
 	src/lua test/hello.lua
diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
index 01088abce..ff6661607 100644
--- a/deps/lua/src/Makefile
+++ b/deps/lua/src/Makefile
@@ -8,7 +8,7 @@
 PLAT= none
 
 CC= gcc
-CFLAGS= -O2 -Wall $(MYCFLAGS) $(ARCH)
+CFLAGS= -O2 -Wall $(MYCFLAGS)
 AR= ar rcu
 RANLIB= ranlib
 RM= rm -f
@@ -52,10 +52,10 @@ $(LUA_A): $(CORE_O) $(LIB_O)
 	$(RANLIB) $@
 
 $(LUA_T): $(LUA_O) $(LUA_A)
-	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) $(ARCH)
+	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 
 $(LUAC_T): $(LUAC_O) $(LUA_A)
-	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) $(ARCH)
+	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 
 clean:
 	$(RM) $(ALL_T) $(ALL_O)
@@ -84,7 +84,7 @@ aix:
 	$(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
 
 ansi:
-	$(MAKE) all MYCFLAGS=-DLUA_ANSI ARCH="$(ARCH)"
+	$(MAKE) all MYCFLAGS=-DLUA_ANSI
 
 bsd:
 	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
-- 
cgit v1.2.1