File tree 2 files changed +11
-2
lines changed
2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,9 @@ distclean:
40
40
ifneq ($(USE_SYSTEM_JEMALLOC ) ,yes)
41
41
-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
42
42
endif
43
+ ifneq ($(USE_SYSTEM_ROCKSDB ) ,yes)
43
44
-(cd rocksdb && $(MAKE) clean) > /dev/null || true
45
+ endif
44
46
-(cd hdr_histogram && $(MAKE) clean) > /dev/null || true
45
47
-(rm -f .make-*)
46
48
Original file line number Diff line number Diff line change @@ -73,12 +73,19 @@ ifneq ($(strip $(SANITIZE)),)
73
73
endif
74
74
75
75
ifeq ($(ENABLE_FLASH ) ,yes)
76
+ STORAGE_OBJ+= storage/rocksdb.o storage/rocksdbfactory.o
77
+ ifeq ($(USE_SYSTEM_ROCKSDB ) ,yes)
78
+ FINAL_LIBS+= $(shell pkg-config --libs rocksdb)
79
+ FINAL_CXXFLAGS+= $(shell pkg-config --cflags rocksdb) -DENABLE_ROCKSDB
80
+
81
+ else
76
82
FINAL_LIBS+= -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
77
83
CXXFLAGS+= -I../deps/rocksdb/include/ -DENABLE_ROCKSDB
78
- STORAGE_OBJ += storage/ rocksdb.o storage/rocksdbfactory.o
84
+ FINAL_CXXFLAGS += -I../deps/ rocksdb/include/
79
85
FINAL_LIBS+= ../deps/rocksdb/librocksdb.a
80
86
DEPENDENCY_TARGETS+= rocksdb
81
87
endif
88
+ endif
82
89
83
90
84
91
ifeq ($(CHECKED ) ,true)
@@ -268,7 +275,7 @@ endif
268
275
269
276
# Include paths to dependencies
270
277
FINAL_CFLAGS+ = -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
271
- FINAL_CXXFLAGS+ = -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/rocksdb/include/
278
+ FINAL_CXXFLAGS+ = -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
272
279
273
280
ifeq ($(USE_SYSTEM_CONCURRENTQUEUE ) ,yes)
274
281
FINAL_CXXFLAGS+= -I/usr/include/concurrentqueue/moodycamel
You can’t perform that action at this time.
0 commit comments