diff options
| author | Alexander Neben <alexander.neben@mongodb.com> | 2022-05-24 21:55:23 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-24 22:24:51 +0000 |
| commit | 55ef8e5a8f084a68efa3e8ba148fb77d72117c49 (patch) | |
| tree | a9aa97075fe888522b602c4cfaf4e9f7297d2849 /SConstruct | |
| parent | cfb451817c7cfa88883334d90bc3e053fa3fbe12 (diff) | |
| download | mongo-55ef8e5a8f084a68efa3e8ba148fb77d72117c49.tar.gz | |
SERVER-66384 Ninja shared build log and common output directory
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 0981b3008a2..2350fd17714 100644 --- a/SConstruct +++ b/SConstruct @@ -2,7 +2,6 @@ import atexit import copy -import datetime import errno import json import os @@ -957,6 +956,11 @@ env_vars.Add('MSVC_VERSION', help='Sets the version of Visual C++ to use (e.g. 14.2 for VS2019, 14.3 for VS2022)', default="14.3") +env_vars.Add('NINJA_BUILDDIR', + help="Location for shared Ninja state", + default="$BUILD_DIR/ninja", +) + env_vars.Add('NINJA_PREFIX', default="build", help="""A prefix to add to the beginning of generated ninja @@ -1208,7 +1212,6 @@ envDict = dict(BUILD_ROOT=buildDir, LIBDEPS_TAG_EXPANSIONS=[], ) - # By default, we will get the normal SCons tool search. But if the # user has opted into the next gen tools, add our experimental tool # directory into the default toolpath, ahead of whatever is already in @@ -4760,7 +4763,7 @@ if get_option('ninja') != 'disabled': env.FatalError("Use of ccache is mandatory with --ninja and icecream older than 1.2. You are running {}.".format(env['ICECREAM_VERSION'])) ninja_builder = Tool("ninja") - env["NINJA_BUILDDIR"] = env.Dir("$BUILD_DIR/ninja") + env["NINJA_BUILDDIR"] = env.Dir("$NINJA_BUILDDIR") ninja_builder.generate(env) ninjaConf = Configure(env, help=False, custom_tests = { |