diff options
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( |