summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorHenrik Edin <henrik.edin@mongodb.com>2019-01-09 12:54:11 -0500
committerHenrik Edin <henrik.edin@mongodb.com>2019-01-25 13:37:26 -0500
commitcb7c8ceba4bf7d6007a250799bfa35c129dd3e58 (patch)
tree1a9285e804767841de1b664150c73abd36e2f45c /SConstruct
parent4f06ba60e0fef61a4136c4c77ae4e98627e16ffa (diff)
downloadmongo-cb7c8ceba4bf7d6007a250799bfa35c129dd3e58.tar.gz
SERVER-37996 Add stock gperftools 2.7 as an allocator option activated with --allocator=tcmalloc-experimental
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct6
1 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index 02143fc1531..e5f794b4b94 100644
--- a/SConstruct
+++ b/SConstruct
@@ -273,7 +273,7 @@ add_option('durableDefaultOn',
)
add_option('allocator',
- choices=["auto", "system", "tcmalloc"],
+ choices=["auto", "system", "tcmalloc", "tcmalloc-experimental"],
default="auto",
help='allocator to use (use "auto" for best choice for current platform)',
type='choice',
@@ -2591,7 +2591,7 @@ def doConfigure(myenv):
# GCC's implementation of ASAN depends on libdl.
env.Append(LIBS=['dl'])
- if env['MONGO_ALLOCATOR'] == 'tcmalloc':
+ if env['MONGO_ALLOCATOR'] in ['tcmalloc', 'tcmalloc-experimental']:
# There are multiply defined symbols between the sanitizer and
# our vendorized tcmalloc.
env.FatalError("Cannot use --sanitize with tcmalloc")
@@ -3303,7 +3303,7 @@ def doConfigure(myenv):
if myenv['MONGO_ALLOCATOR'] == 'tcmalloc':
if use_system_version_of_library('tcmalloc'):
conf.FindSysLibDep("tcmalloc", ["tcmalloc"])
- elif myenv['MONGO_ALLOCATOR'] == 'system':
+ elif myenv['MONGO_ALLOCATOR'] in ['system', 'tcmalloc-experimental']:
pass
else:
myenv.FatalError("Invalid --allocator parameter: $MONGO_ALLOCATOR")