From d6daac04dab4b3acf4b88f16742d1b402cdc3d83 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 1 Oct 2014 18:54:04 +0200
Subject: [PATCH] Explicitly disable tcmalloc

Without this change leveldb autodetects tcmalloc from sysroot and
sometimes became dependant on gperftools

Disable autodetection without TCMALLOC_ENABLED=true pased to make

Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 build_detect_platform | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/build_detect_platform b/build_detect_platform
index bb76c4f..a586364 100755
--- a/build_detect_platform
+++ b/build_detect_platform
@@ -201,15 +201,17 @@ EOF
         PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
     fi
 
-    # Test whether tcmalloc is available
-    $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null  <<EOF
-      int main() {}
+    if [ "$TCMALLOC_ENABLED" = "true" ]; then
+        # Test whether tcmalloc is available
+        $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null  <<EOF
+          int main() {}
 EOF
-    if [ "$?" = 0 ]; then
-        PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
-    fi
+        if [ "$?" = 0 ]; then
+            PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
+        fi
 
-    rm -f $CXXOUTPUT 2>/dev/null
+        rm -f $CXXOUTPUT 2>/dev/null
+    fi
 fi
 
 PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
-- 
2.1.1

