Skip to content

Commit be98a33

Browse files
committed
fixed compilation with 32bit target
1 parent 97e7f8a commit be98a33

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

deps/linenoise/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
linenoise_example: linenoise.h linenoise.c
22

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

66
.c.o:
7-
$(CC) -c -Wall -W -Os -g $<
7+
$(CC) $(ARCH) -c -Wall -W -Os -g $<
88

99
clean:
10-
rm -f linenoise_example
10+
rm -f linenoise_example *.o

src/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ redis-benchmark.o:
116116
$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
117117

118118
redis-cli: $(CLIOBJ)
119-
cd ../deps/hiredis && make static
120-
cd ../deps/linenoise && make
119+
cd ../deps/hiredis && make static ARCH="$(ARCH)"
120+
cd ../deps/linenoise && make ARCH="$(ARCH)"
121121
$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
122122

123123
redis-cli.o:
@@ -134,6 +134,8 @@ redis-check-aof: $(CHECKAOFOBJ)
134134

135135
clean:
136136
rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov
137+
cd ../deps/hiredis && make clean
138+
cd ../deps/linenoise && make clean
137139

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

0 commit comments

Comments
 (0)