diff options
| author | Andrew Morrow <acm@mongodb.com> | 2020-05-26 16:03:59 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-28 22:19:41 +0000 |
| commit | 463d6ccc4db36ae3d1fb9eca96838acf6b753680 (patch) | |
| tree | 7c6abadd701c3e58adb64e86758647a81c78a97c /SConstruct | |
| parent | d27fee71735296eb34adf6372e0d3300c801a47e (diff) | |
| download | mongo-463d6ccc4db36ae3d1fb9eca96838acf6b753680.tar.gz | |
SERVER-47776 Promote ninja_next.py to ninja.py
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/SConstruct b/SConstruct index 3c7193ab776..3791f15aa1e 100644 --- a/SConstruct +++ b/SConstruct @@ -3895,40 +3895,6 @@ if get_option('ninja') != 'disabled': if get_option('ninja') == 'stable': ninja_builder = Tool("ninja") ninja_builder.generate(env) - - # Explicitly add all generated sources to the DAG so NinjaBuilder can - # generate rules for them. SCons if the files don't exist will not wire up - # the dependencies in the DAG because it cannot scan them. The Ninja builder - # does not care about the actual edge here as all generated sources will be - # pushed to the "bottom" of it's DAG via the order_only dependency on - # _generated_sources (an internal phony target) - if get_option('install-mode') == 'hygienic': - env.Alias("install-common-base", env.Alias("generated-sources")) - else: - env.Alias("all", env.Alias("generated-sources")) - env.Alias("core", env.Alias("generated-sources")) - - if env.get("NINJA_SUFFIX") and env["NINJA_SUFFIX"][0] != ".": - env["NINJA_SUFFIX"] = "." + env["NINJA_SUFFIX"] - - if get_option("install-mode") == "hygienic": - ninja_build = env.Ninja( - target="${NINJA_PREFIX}.ninja$NINJA_SUFFIX", - source=[ - env.Alias("install-all-meta"), - env.Alias("test-execution-aliases"), - ], - ) - else: - ninja_build = env.Ninja( - target="${NINJA_PREFIX}.ninja$NINJA_SUFFIX", - source=[ - env.Alias("all"), - env.Alias("test-execution-aliases"), - ], - ) - - env.Alias("generate-ninja", ninja_build) else: ninja_builder = Tool("ninja_next") ninja_builder.generate(env) |