diff options
| author | Tausif Rahman <tausif.rahman@mongodb.com> | 2022-08-26 13:56:34 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-26 14:40:49 +0000 |
| commit | 41d0a45aaf90b8e4e9a91f13a72e5623ecd963c4 (patch) | |
| tree | 67e6ca05bf13d0c4b74e149143be93ee7fe2c022 /SConstruct | |
| parent | 3b17e5f7916fdf1a21dd162a079aeb9d06ca9425 (diff) | |
| download | mongo-41d0a45aaf90b8e4e9a91f13a72e5623ecd963c4.tar.gz | |
SERVER-68003 Make experiment_unified_ninja.vars the default
Diffstat (limited to 'SConstruct')
| -rwxr-xr-x | SConstruct | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 8c49df4b62c..81f620e22d6 100755 --- a/SConstruct +++ b/SConstruct @@ -1016,17 +1016,10 @@ env_vars.Add( converter=variable_shlex_converter, ) -default_destdir = '$BUILD_ROOT/install' -if get_option('ninja') != 'disabled': - # Workaround for SERVER-53952 where issues wih different - # ninja files building to the same install dir. Different - # ninja files need to build to different install dirs. - default_destdir = '$BUILD_DIR/install' - env_vars.Add( 'DESTDIR', help='Where builds will install files', - default=default_destdir, + default='$BUILD_ROOT/install', ) env_vars.Add( @@ -1220,7 +1213,7 @@ env_vars.Add( env_vars.Add( 'NINJA_BUILDDIR', help="Location for shared Ninja state", - default="$BUILD_DIR/ninja", + default="$BUILD_ROOT/ninja", ) env_vars.Add( |