diff options
| author | Mathew Robinson <mathew@chasinglogic.io> | 2020-03-03 09:42:43 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-06 11:38:44 +0000 |
| commit | 727fe1181cc8ff8d3c6282662229d28651a927d9 (patch) | |
| tree | 23bb5f5badba9f93ed954932a93523368ef93757 /SConstruct | |
| parent | deb72f3c5099582019a504e0477b96014fa7caf0 (diff) | |
| download | mongo-727fe1181cc8ff8d3c6282662229d28651a927d9.tar.gz | |
SERVER-46129 Fix various DAG inconsistencies
Some dependencies were getting wired when they should not or were
false dependencies.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index a3502907dac..2b96f7a1e8c 100644 --- a/SConstruct +++ b/SConstruct @@ -3840,6 +3840,7 @@ if get_option('ninja') != 'disabled': else: ninja_builder = Tool("ninja_next") ninja_builder.generate(env) + env.Default(env.Alias("install-all-meta")) # idlc.py has the ability to print it's implicit dependencies # while generating, Ninja can consume these prints using the @@ -4207,10 +4208,8 @@ else: target="#lint-eslint", source=[ "buildscripts/eslint.py", - "jstests/", - "src/mongo/", ], - action="$PYTHON ${SOURCES[0]} --dirmode lint ${SOURCES[1:]}", + action="$PYTHON ${SOURCES[0]} --dirmode lint jstests/ src/mongo", ) lint_py = env.Command( @@ -4491,12 +4490,13 @@ env.SConscript( ) -allTargets = ['core', 'tools', 'unittests', 'integration_tests', 'libfuzzer_tests', 'benchmarks'] +if get_option("install-mode") != "hygienic": + allTargets = ['core', 'tools', 'unittests', 'integration_tests', 'libfuzzer_tests', 'benchmarks'] -if not has_option('noshell') and usemozjs: - allTargets.extend(['dbtest']) + if not has_option('noshell') and usemozjs: + allTargets.extend(['dbtest']) -env.Alias('all', allTargets) + env.Alias('all', allTargets) # run the Dagger tool if it's installed if should_dagger: |