explicitly set JEMALLOC for rocksdb.

Signed-off-by: Mark Nelson <mnelson@redhat.com>

diff --git a/src/kv/Makefile.am b/src/kv/Makefile.am
index 95a189576afe6326eba2c20cb774712bc21f2c2b..5fcbe8012307c3c5dbaefab541956ae713f5d49d 100644 (file)
--- a/src/kv/Makefile.am
+++ b/src/kv/Makefile.am
@@ -25,8 +25,15 @@ else
 NPROC = nproc
 endif
 
+# explicitly disable jemalloc unless we are using it.
+if WITH_JEMALLOC
+DISABLE_JEMALLOC = 0
+else
+DISABLE_JEMALLOC = 1
+endif
+
 rocksdb/librocksdb.a:
-       cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 ${MAKE} -j$(shell ${NPROC}) static_lib
+       cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 DISABLE_JEMALLOC="${DISABLE_JEMALLOC}" ${MAKE} -j$(shell ${NPROC}) static_lib
 libkv_a_CXXFLAGS += -I rocksdb/include -fPIC
 libkv_a_SOURCES += kv/RocksDBStore.cc
 libkv_a_LIBADD += rocksdb/librocksdb.a