diff options
| author | Andrew Morrow <acm@mongodb.com> | 2020-04-22 17:02:59 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-26 23:18:08 +0000 |
| commit | 6e9fa7d74b8f2b4ca6c1f765a08d0ea2bb9e87d2 (patch) | |
| tree | 457503787cbc4fdc29283aa4313859935c7d6284 /site_scons | |
| parent | 76e7de4df5b74f1a1b9bf84b1d0384ae360dad32 (diff) | |
| download | mongo-6e9fa7d74b8f2b4ca6c1f765a08d0ea2bb9e87d2.tar.gz | |
SERVER-46611 Don't allow build.ninja to depend on conftests
(cherry picked from commit 86bfdfc4e6d2882be55856bb65df86e451d9c66b)
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/site_tools/ninja_next.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/site_scons/site_tools/ninja_next.py b/site_scons/site_tools/ninja_next.py index fe437b8738f..9f38562e8ed 100644 --- a/site_scons/site_tools/ninja_next.py +++ b/site_scons/site_tools/ninja_next.py @@ -1374,7 +1374,8 @@ def generate(env): # the DAG which is required so that we walk every target, and therefore add # it to the global NINJA_STATE, before we try to write the ninja file. def ninja_file_depends_on_all(target, source, env): - env.Depends(ninja_file, target) + if not any("conftest" in str(t) for t in target): + env.Depends(ninja_file, target) return target, source # The "Alias Builder" isn't in the BUILDERS map so we have to |