From f8a4c2161a2bcfcca52bf72e64e430723710f4f7 Mon Sep 17 00:00:00 2001
From: Daniel Moody <daniel.moody@mongodb.com>
Date: Thu, 1 Apr 2021 04:49:56 +0000
Subject: SERVER-53952 Moved ninja install dir into build variant due to ninja
 limitations.

(cherry picked from commit 27b41724ed822f1d938e1f90df4adccc2b7d4609)
---
 SConstruct | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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',
-- 
cgit v1.2.1