From: antirez <antirez@gmail.com>
Date: Mon, 8 Nov 2010 11:53:36 +0000 (+0100)
Subject: fixed compilation with 32bit target
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/be98a33b511cec5cd3fce281360cea1dfc73d15a

fixed compilation with 32bit target
---

diff --git a/deps/linenoise/Makefile b/deps/linenoise/Makefile
index e4a5476d..841f3907 100644
--- a/deps/linenoise/Makefile
+++ b/deps/linenoise/Makefile
@@ -1,10 +1,10 @@
 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:
-	$(CC) -c -Wall -W -Os -g $<
+	$(CC) $(ARCH) -c -Wall -W -Os -g $<
 
 clean:
-	rm -f linenoise_example
+	rm -f linenoise_example *.o
diff --git a/src/Makefile b/src/Makefile
index ad211bed..07d65465 100644
--- 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)
-	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:
@@ -134,6 +134,8 @@ redis-check-aof: $(CHECKAOFOBJ)
 
 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