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-09-16 15:19:57 +0000 |
| commit | 787238e02e9ac372b495874f7047216f13e9f62b (patch) | |
| tree | 689a816f2968448dc1366d183257c8c2b32ff90e /SConstruct | |
| parent | f7f6c6928320873089b443da007de119b926f605 (diff) | |
| download | mongo-787238e02e9ac372b495874f7047216f13e9f62b.tar.gz | |
SERVER-68003 Make experiment_unified_ninja.vars the default
(cherry picked from commit 41d0a45aaf90b8e4e9a91f13a72e5623ecd963c4)
(cherry picked from commit 6e2d63630ee90db15b7b122aba1b8c538357a0df)
Diffstat (limited to 'SConstruct')
| -rwxr-xr-x | SConstruct | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index 3b85e800328..a0700af4f92 100755 --- a/SConstruct +++ b/SConstruct @@ -846,16 +846,11 @@ env_vars.Add('CXXFLAGS', help='Sets flags for the C++ compiler', 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', +env_vars.Add( + 'DESTDIR', help='Where builds will install files', - default=default_destdir) + default='$BUILD_ROOT/install', +) env_vars.Add('DSYMUTIL', help='Path to the dsymutil utility', @@ -988,7 +983,7 @@ env_vars.Add('MSVC_VERSION', env_vars.Add('NINJA_BUILDDIR', help="Location for shared Ninja state", - default="$BUILD_DIR/ninja", + default="$BUILD_ROOT/ninja", ) env_vars.Add( |