Skip to content

Commit 94e71c3

Browse files
committed
[fix] decoupling librocksdb.a
1 parent 5dda9d8 commit 94e71c3

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,12 +515,22 @@ $(TLS_MODULE_NAME): $(REDIS_SERVER_NAME)
515515
$(QUIET_CC)$(CC) -o $@ tls.c -shared -fPIC $(TLS_MODULE_CFLAGS) $(TLS_CLIENT_LIBS)
516516

517517
# redis-cli
518+
ifdef SWAP
519+
$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ) ../deps/rocksdb/librocksdb.a
520+
$(REDIS_LD) -o $@ $(REDIS_CLI_OBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS)
521+
else
518522
$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
519523
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS)
524+
endif
520525

521526
# redis-benchmark
527+
ifdef SWAP
528+
$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ) ../deps/rocksdb/librocksdb.a
529+
$(REDIS_LD) -o $@ $(REDIS_BENCHMARK_OBJ) ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS)
530+
else
522531
$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)
523532
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS)
533+
endif
524534

525535
DEP = $(REDIS_SERVER_OBJ:%.o=%.d) $(REDIS_VEC_SETS_OBJ:%.o=%.d) $(REDIS_CLI_OBJ:%.o=%.d) $(REDIS_BENCHMARK_OBJ:%.o=%.d)
526536
-include $(DEP)

0 commit comments

Comments
 (0)