gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed compilation with 32bit target

Browse Source
This commit is contained in:
antirez 2010-11-08 12:53:36 +01:00
parent 97e7f8aec3
commit be98a33b51
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/linenoise/Makefile vendored
View File

@ -1,10 +1,10 @@
linenoise_example: linenoise.h linenoise.c linenoise_example: linenoise.h linenoise.c
linenoise_example: linenoise.o example.o 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

6
src/Makefile
View File

@ -116,8 +116,8 @@ redis-benchmark.o:
$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $< $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
redis-cli: $(CLIOBJ) redis-cli: $(CLIOBJ)
cd ../deps/hiredis && make static cd ../deps/hiredis && make static ARCH="$(ARCH)"
cd ../deps/linenoise && make cd ../deps/linenoise && make ARCH="$(ARCH)"
$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
redis-cli.o: redis-cli.o:
@ -134,6 +134,8 @@ redis-check-aof: $(CHECKAOFOBJ)
clean: clean:
rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov
cd ../deps/hiredis && make clean
cd ../deps/linenoise && make clean
dep: dep:
$(CC) -MM *.c $(CC) -MM *.c