summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2020-05-12 11:51:20 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-05-15 20:21:47 +0000
commite7f48c501a37ce24b98520d53a00aa9dd2129efb (patch)
tree5cf1f49e7a1b0a848fc24cc3fac2d6c737624d05 /SConstruct
parent1d5d11155689d29bb7de42ccb5a5f4b3c7247469 (diff)
downloadmongo-e7f48c501a37ce24b98520d53a00aa9dd2129efb.tar.gz
SERVER-48139 Dagger should depend on install-all-meta in hygienic mode
(cherry picked from commit 7ebf6ac44459a2ecb69243a204860b99dabe21b0)
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct7
1 files changed, 3 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index ffe38b415b8..470c685fc5d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4569,7 +4569,6 @@ env.SConscript(
],
)
-
if get_option("install-mode") != "hygienic":
allTargets = ['core', 'tools', 'unittests', 'integration_tests', 'libfuzzer_tests', 'benchmarks']
@@ -4580,9 +4579,9 @@ if get_option("install-mode") != "hygienic":
# run the Dagger tool if it's installed
if should_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, allTargets)
+ dagger = env.Dagger('library_dependency_graph.json')
+ env.Depends(dagger, env.Alias("install-all") if get_option("install-mode") == "hygienic" else "all")
+ dependencyDb = env.Alias("dagger", dagger)
# Declare the cache prune target
cachePrune = env.Command(