From 4c7b79a5287c970aa445d5acf4b363683ee9f439 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Thu, 27 Jul 2017 10:58:48 +0800 Subject: [PATCH] rocksdb, compilation: disable some flags according to CONFIG. This will avoid possible complitation issue. Change-Id: I423d5e200c53cae4f8c5317d8b04e08a09c3b59a Signed-off-by: Ziye Yang Reviewed-on: https://review.gerrithub.io/371435 Tested-by: SPDK Automated Test System Reviewed-by: GangCao Reviewed-by: Daniel Verkamp Reviewed-by: Ben Walker --- lib/rocksdb/spdk.rocksdb.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/rocksdb/spdk.rocksdb.mk b/lib/rocksdb/spdk.rocksdb.mk index b952ba17e..5b723e6ef 100644 --- a/lib/rocksdb/spdk.rocksdb.mk +++ b/lib/rocksdb/spdk.rocksdb.mk @@ -46,8 +46,12 @@ CXXFLAGS += -Wno-missing-declarations # The SPDK Makefiles may turn these options on but we do not want to enable # them for the RocksDB source files. CXXFLAGS += -fno-profile-arcs -fno-test-coverage +ifeq ($(CONFIG_UBSAN),y) CXXFLAGS += -fno-sanitize=undefined +endif +ifeq ($(CONFIG_ASAN),y) CXXFLAGS += -fno-sanitize=address +endif SPDK_LIB_LIST = event_bdev event_copy event_rpc SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \