summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorGabriel Russell <gabriel.russell@mongodb.com>2017-02-14 15:46:21 -0500
committerGabriel Russell <gabriel.russell@mongodb.com>2017-02-21 12:38:54 -0500
commit8a3d8413253a73f5d642d7ddfba6f4a6107f5792 (patch)
tree98d5d509f1c94cb212b28b3cba78c1eae211b956 /SConstruct
parent7ba5e3f4961be80b99a7dc69f84ed74309da59b2 (diff)
downloadmongo-8a3d8413253a73f5d642d7ddfba6f4a6107f5792.tar.gz
SERVER-27564 install dagger tool before running SConscript() on src/
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct10
1 files changed, 6 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 49973c1ee45..c0344aefd74 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2925,6 +2925,11 @@ env = doConfigure( env )
# compilation database entries for the configure tests, which is weird.
env.Tool("compilation_db")
+# If we can, load the dagger tool for build dependency graph introspection.
+# Dagger is only supported on Linux and OSX (not Windows or Solaris).
+if is_running_os('osx') or is_running_os('linux'):
+ env.Tool("dagger")
+
def checkErrorCodes():
import buildscripts.errorcodes as x
if x.checkErrorCodes() == False:
@@ -3071,12 +3076,9 @@ env.SConscript(
all = env.Alias('all', ['core', 'tools', 'dbtest', 'unittests', 'integration_tests'])
-# If we can, load the dagger tool for build dependency graph introspection.
-# Dagger is only supported on Linux and OSX (not Windows or Solaris).
+# run the Dagger tool if it's installed
if is_running_os('osx') or is_running_os('linux'):
- env.Tool("dagger")
dependencyDb = env.Alias("dagger", env.Dagger('library_dependency_graph.json'))
-
# Require everything to be built before trying to extract build dependency information
env.Requires(dependencyDb, all)