Disable jemalloc static check when linked dynamically

rethinkdb · Feb 11, 2015 · ceaa211 · ceaa211
1 parent 1d30a29
commit ceaa211
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/configure b/configure
@@ -137,8 +137,10 @@ configure () {
     if [[ "$ALLOCATOR" = system ]]; then
         var MALLOC_LIBS ""
         var MALLOC_LIBS_DEP ""
+        boolvar STATIC_MALLOC false
     else
         check_lib "$ALLOCATOR" require
+        boolvar STATIC_MALLOC contains "$static_libs" "$ALLOCATOR"
         macro MALLOC_LIBS     "\$($(uc $ALLOCATOR)_LIBS)"
         macro MALLOC_LIBS_DEP "\$($(uc $ALLOCATOR)_LIBS_DEP)"
     fi
@@ -801,6 +803,7 @@ fetch_lib () {
     macro "$(uc "$1")_LIBS_DEP"         "\$(SUPPORT_BUILD_DIR)/${pkg}_$version/lib/lib$1.a"
     macro "$(uc "$1")_INCLUDE" "-isystem \$(SUPPORT_BUILD_DIR)/${pkg}_$version/include"
     macro "$(uc "$1")_INCLUDE_DEP"      "\$(SUPPORT_BUILD_DIR)/${pkg}_$version/include"
+    static_libs="$static_libs $1"
 }
 
 # require_dep <name>

diff --git a/src/build.mk b/src/build.mk
@@ -329,7 +329,7 @@ rethinkdb: $(BUILD_DIR)/$(SERVER_EXEC_NAME)
 RETHINKDB_DEPENDENCIES_LIBS := $(MALLOC_LIBS_DEP) $(V8_LIBS_DEP) $(PROTOBUF_LIBS_DEP) $(RE2_LIBS_DEP) $(Z_LIBS_DEP) $(CURL_LIBS_DEP) $(CRYPTO_LIBS_DEP)
 
 MAYBE_CHECK_STATIC_MALLOC =
-ifeq ($(filter -l%, $(value MALLOC_LIBS)),) # if the allocator is not dynamically linked
+ifeq ($(STATIC_MALLOC),1) # if the allocator is statically linked
   ifeq (tcmalloc,$(ALLOCATOR))
     MAYBE_CHECK_STATIC_MALLOC = objdump -T $@ | c++filt | grep -q 'tcmalloc::\|google_malloc' ||
     MAYBE_CHECK_STATIC_MALLOC += (echo "Failed to link in TCMalloc." >&2 && false)