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

diff --git a/deps/lua/Makefile b/deps/lua/Makefile
index eed4aedc48e4db8356170d8493657e1e69fa81a1..6e78f66fa5b1763b119236e1bd7de95f42093e52 100644 (file)
--- a/deps/lua/Makefile
+++ b/deps/lua/Makefile
@@ -53,7 +53,7 @@ R= 5.1.4
 all:   $(PLAT)
 
 $(PLATS) clean:
 all:   $(PLAT)
 
 $(PLATS) clean:

-       cd src && $(MAKE) ARCH="$(ARCH)" $@
+       cd src && $(MAKE) $@

 
 test:  dummy
        src/lua test/hello.lua
 
 test:  dummy
        src/lua test/hello.lua

diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
index 01088abceb0f70b8a51950f29109f579a9b0096f..ff6661607a0b8490e423f7fb7782cfb0b9c5197e 100644 (file)
--- a/deps/lua/src/Makefile
+++ b/deps/lua/src/Makefile
@@ -8,7 +8,7 @@
 PLAT= none
 
 CC= gcc
 PLAT= none
 
 CC= gcc

-CFLAGS= -O2 -Wall $(MYCFLAGS) $(ARCH)
+CFLAGS= -O2 -Wall $(MYCFLAGS)

 AR= ar rcu
 RANLIB= ranlib
 RM= rm -f
 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)
        $(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)
 
 $(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)
 
 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 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"
 
 bsd:
        $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"

diff --git a/src/Makefile b/src/Makefile
index 04f2a68c832513d9677205bba6588ebc3c41e61a..6cb5f062302436771ef4f2e64c4825f2a7668a1e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,6 +46,7 @@ endif
 
 CCLINK+= $(ALLOC_LINK)
 CFLAGS+= $(ALLOC_FLAGS)
 
 CCLINK+= $(ALLOC_LINK)
 CFLAGS+= $(ALLOC_FLAGS)

+LUA_CFLAGS+= $(ARCH)

 
 CCOPT= $(CFLAGS) $(ARCH) $(PROF)
 
 
 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)
        @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
 
 ../deps/jemalloc/lib/libjemalloc.a:
        cd ../deps/jemalloc && ./configure $(JEMALLOC_CFLAGS) --with-jemalloc-prefix=je_ --enable-cc-silence && $(MAKE) lib/libjemalloc.a