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-19 15:55:19 +0000 |
| commit | 763a3efc818a57eb034a75c37300df0b8ea3eabc (patch) | |
| tree | 790d9fb846abb8b5c9425d55a3862fdc478bab8a /SConstruct | |
| parent | cc34fa291c577b580d8c3619cc787797a5bc9445 (diff) | |
| download | mongo-763a3efc818a57eb034a75c37300df0b8ea3eabc.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 | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 3a1bdd30392..f6960c31037 100755 --- a/SConstruct +++ b/SConstruct @@ -1017,17 +1017,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( @@ -1221,7 +1214,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( |