summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2016-06-08 11:28:07 -0400
committerAndrew Morrow <acm@mongodb.com>2017-03-21 14:00:46 -0400
commit39f71f9f17103d47ef9b1234cb506aa8ad420114 (patch)
tree1e4586e7bd74488be30eb02f85b6df52a3e0d010 /SConstruct
parentcbbdb02faead044e07b5a7d957298cdc07cc9258 (diff)
downloadmongo-39f71f9f17103d47ef9b1234cb506aa8ad420114.tar.gz
SERVER-20540 Add an emitter for .dwo generated by -gsplit-dwarf
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct8
1 files changed, 7 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 71699286629..30c4f9bd32c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -915,7 +915,7 @@ envDict = dict(BUILD_ROOT=buildDir,
UNITTEST_LIST='$BUILD_ROOT/unittests.txt',
INTEGRATION_TEST_ALIAS='integration_tests',
INTEGRATION_TEST_LIST='$BUILD_ROOT/integration_tests.txt',
- CONFIGUREDIR='$BUILD_DIR/scons/sconf_temp',
+ CONFIGUREDIR='$BUILD_ROOT/scons/$VARIANT_DIR/sconf_temp',
CONFIGURELOG='$BUILD_ROOT/scons/config.log',
INSTALL_DIR=installDir,
CONFIG_HEADER_DEFINES={},
@@ -2989,6 +2989,12 @@ def doConfigure(myenv):
env = doConfigure( env )
+# If the flags in the environment are configured for -gsplit-dwarf,
+# inject the necessary emitter.
+split_dwarf = Tool('split_dwarf')
+if split_dwarf.exists(env):
+ split_dwarf(env)
+
# Load the compilation_db tool. We want to do this after configure so we don't end up with
# compilation database entries for the configure tests, which is weird.
env.Tool("compilation_db")