blob: 4b76dd0c31b4edba0aa4a2273ea4139d4210cdfd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
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
|
