From: antirez <antirez@gmail.com>
Date: Tue, 8 Nov 2011 20:00:52 +0000 (+0100)
Subject: 32bit build fixed, broken by a previous commit fixing build on Solaris
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/b28d0461b47a8c607aabe437bdca703ee7619014?hp=aa9a61ccd7cc1ffa1441ef74edd9d51954fc7896

32bit build fixed, broken by a previous commit fixing build on Solaris
---

diff --git a/deps/lua/Makefile b/deps/lua/Makefile
index eed4aedc..6e78f66f 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 01088abc..ff666160 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"
diff --git a/src/Makefile b/src/Makefile
index 04f2a68c..6cb5f062 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,6 +46,7 @@ endif
 
 CCLINK+= $(ALLOC_LINK)
 CFLAGS+= $(ALLOC_FLAGS)
+LUA_CFLAGS+= $(ARCH)
 
 CCOPT= $(CFLAGS) $(ARCH) $(PROF)
 
@@ -167,7 +168,7 @@ dependencies:
 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR)
 	@cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
 	@echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)Lua ansi$(ENDCOLOR)
-	@cd ../deps/lua && $(MAKE) ARCH="$(ARCH)" CFLAGS="$(LUA_CFLAGS)" ansi
+	@cd ../deps/lua && $(MAKE) CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(ARCH)" ansi
 
 ../deps/jemalloc/lib/libjemalloc.a:
 	cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a