fixed compilation with 32bit target

diff --git a/deps/linenoise/Makefile b/deps/linenoise/Makefile
index e4a5476d679370bdada0034f0693c19f4b54c4b6..841f39072fff76ee6060581f0f264ecf8d5a6910 100644 (file)
--- a/deps/linenoise/Makefile
+++ b/deps/linenoise/Makefile
@@ -1,10 +1,10 @@
 linenoise_example: linenoise.h linenoise.c
 
 linenoise_example: linenoise.o example.o
 linenoise_example: linenoise.h linenoise.c
 
 linenoise_example: linenoise.o example.o

-       $(CC) -Wall -W -Os -g -o linenoise_example linenoise.o example.o
+       $(CC) $(ARCH) -Wall -W -Os -g -o linenoise_example linenoise.o example.o

 
 .c.o:
 
 .c.o:

-       $(CC) -c -Wall -W -Os -g $<
+       $(CC) $(ARCH) -c -Wall -W -Os -g $<

 
 clean:
 
 clean:

-       rm -f linenoise_example
+       rm -f linenoise_example *.o

diff --git a/src/Makefile b/src/Makefile
index ad211bed13c561255193fc55be2968aa9bbccfae..07d6546520a14c40bcdd30ad108b4e9141a7c507 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -116,8 +116,8 @@ redis-benchmark.o:
        $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
 
 redis-cli: $(CLIOBJ)
        $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
 
 redis-cli: $(CLIOBJ)

-       cd ../deps/hiredis && make static
-       cd ../deps/linenoise && make
+       cd ../deps/hiredis && make static ARCH="$(ARCH)"
+       cd ../deps/linenoise && make ARCH="$(ARCH)"

        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
 
 redis-cli.o:
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
 
 redis-cli.o:


@@ -134,6 +134,8 @@ redis-check-aof: $(CHECKAOFOBJ)
 
 clean:
        rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov
 
 clean:
        rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov

+       cd ../deps/hiredis && make clean
+       cd ../deps/linenoise && make clean

 
 dep:
        $(CC) -MM *.c
 
 dep:
        $(CC) -MM *.c