diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-04-01 04:49:56 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-28 20:12:16 +0000 |
| commit | f8a4c2161a2bcfcca52bf72e64e430723710f4f7 (patch) | |
| tree | 0dc7160bb64d8a15a19e468c33bbd69736b2c114 | |
| parent | 23311306d0af7e3de01ccd025ca608c3d53ec111 (diff) | |
| download | mongo-f8a4c2161a2bcfcca52bf72e64e430723710f4f7.tar.gz | |
SERVER-53952 Moved ninja install dir into build variant due to ninja limitations.
(cherry picked from commit 27b41724ed822f1d938e1f90df4adccc2b7d4609)
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index a9d8042dfbe..83e50dbb177 100644 --- a/SConstruct +++ b/SConstruct @@ -756,9 +756,16 @@ env_vars.Add('CXXFLAGS', help='Sets flags for the C++ compiler', converter=variable_shlex_converter) +default_destdir = '$BUILD_ROOT/install' +if get_option('ninja') and get_option('build-tools') == 'next': + # 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 hygienic builds will install files', - default='$BUILD_ROOT/install') + default=default_destdir) env_vars.Add('DSYMUTIL', help='Path to the dsymutil utility', |