SERVER-27497 Scope SCons Environment changes narrowly

13 files changed, 28 insertions, 10 deletions

diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript
index 56d3649dbfe..3245e17d0d4 100644
--- a/src/third_party/IntelRDFPMathLib20U1/SConscript
+++ b/src/third_party/IntelRDFPMathLib20U1/SConscript
@@ -4,6 +4,7 @@ Import("env")
 Import("has_option")
 Import("debugBuild")
 
+env = env.Clone()
 
 files = [
     "LIBRARY/float128/dpml_exception.c",
diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 3a820399677..bc9a2c08927 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -96,6 +96,7 @@ def injectThirdPartyIncludePaths(thisEnv, libraries):
 env.AddMethod(injectAllThirdPartyIncludePaths, 'InjectAllThirdPartyIncludePaths')
 env.AddMethod(injectThirdPartyIncludePaths, 'InjectThirdPartyIncludePaths')
 
+env = env.Clone()
 
 murmurEnv = env.Clone()
 murmurEnv.SConscript('murmurhash3/SConscript', exports={ 'env' : murmurEnv })
@@ -196,7 +197,6 @@ if use_system_version_of_library("zlib"):
 else:
     zlibEnv = env.Clone()
     zlibEnv.InjectThirdPartyIncludePaths(libraries=['zlib'])
-    zlibEnv.InjectMongoIncludePaths()
     zlibEnv.SConscript('zlib' + zlibSuffix + '/SConscript', exports={ 'env' : zlibEnv })
     zlibEnv = zlibEnv.Clone(
         LIBDEPS=[
@@ -234,7 +234,6 @@ if (gperftoolsEnv['MONGO_ALLOCATOR'] == "tcmalloc"):
     else:
         gperftoolsEnv = env.Clone()
         gperftoolsEnv.InjectThirdPartyIncludePaths(libraries=['gperftools'])
-        gperftoolsEnv.InjectMongoIncludePaths()
         gperftoolsEnv.SConscript('gperftools' + gperftoolsSuffix + '/SConscript', exports={ 'env' : gperftoolsEnv })
         gperftoolsEnv = gperftoolsEnv.Clone(
             LIBDEPS=[
diff --git a/src/third_party/asio-asio-1-11-0/SConscript b/src/third_party/asio-asio-1-11-0/SConscript
index 242bb7db889..59dbda73eb4 100644
--- a/src/third_party/asio-asio-1-11-0/SConscript
+++ b/src/third_party/asio-asio-1-11-0/SConscript
@@ -1,6 +1,8 @@
 Import("env")
 Import("has_option")
 
+env = env.Clone()
+
 asio_src = [
     "asio/src/asio.cpp",
 ]
diff --git a/src/third_party/boost-1.60.0/SConscript b/src/third_party/boost-1.60.0/SConscript
index 9a850106b2c..bea790be5ad 100644
--- a/src/third_party/boost-1.60.0/SConscript
+++ b/src/third_party/boost-1.60.0/SConscript
@@ -2,6 +2,8 @@
 
 Import("env")
 
+env = env.Clone()
+
 env.Library('boost_system', ['libs/system/src/error_code.cpp'])
 
 boost_thread_source = dict(
diff --git a/src/third_party/gperftools-2.5/SConscript b/src/third_party/gperftools-2.5/SConscript
index e2696c7d545..b9e7ca1d418 100644
--- a/src/third_party/gperftools-2.5/SConscript
+++ b/src/third_party/gperftools-2.5/SConscript
@@ -4,6 +4,8 @@ Import("env")
 Import("has_option")
 Import("debugBuild")
 
+env = env.Clone()
+
 files = [
     'src/base/dynamic_annotations.c',
     'src/base/elf_mem_image.cc',
diff --git a/src/third_party/libstemmer_c/SConscript b/src/third_party/libstemmer_c/SConscript
index 3b8997f48bc..72b6edf2f9a 100644
--- a/src/third_party/libstemmer_c/SConscript
+++ b/src/third_party/libstemmer_c/SConscript
@@ -2,6 +2,8 @@
 
 Import("env")
 
+env = env.Clone()
+
 # We only use the utf8 stemmers.
 stemming_packages = [
     #"ISO_8859_1_danish",
diff --git a/src/third_party/mozjs-45/SConscript b/src/third_party/mozjs-45/SConscript
index 4d1efd7a58b..b38dfe804fe 100644
--- a/src/third_party/mozjs-45/SConscript
+++ b/src/third_party/mozjs-45/SConscript
@@ -79,8 +79,6 @@ else:
 # We pre-generate configs for platforms and just check them in.  Running
 # mozilla's config requires a relatively huge portion of their tree.
 env.Prepend(CPPPATH=[
-    '#src',
-    '$BUILD_DIR',
     'extract/js/src',
     'extract/mfbt',
     'extract/intl/icu/source/common',
diff --git a/src/third_party/murmurhash3/SConscript b/src/third_party/murmurhash3/SConscript
index 058701e9da8..5c6a8b844f1 100644
--- a/src/third_party/murmurhash3/SConscript
+++ b/src/third_party/murmurhash3/SConscript
@@ -1,5 +1,7 @@
 Import("env")
 
+env = env.Clone()
+
 env.InjectThirdPartyIncludePaths(libraries=['boost'])
 
 env.Append(CPPPATH=['#src', '$BUILD_DIR'])
diff --git a/src/third_party/pcre-8.39/SConscript b/src/third_party/pcre-8.39/SConscript
index e7b9a59a550..b14d2658b66 100644
--- a/src/third_party/pcre-8.39/SConscript
+++ b/src/third_party/pcre-8.39/SConscript
@@ -3,6 +3,7 @@
 Import("env")
 
 env = env.Clone()
+
 env.Append( CPPDEFINES=[ "HAVE_CONFIG_H",  ] )
 
 def removeIfPresent(lst, item):
diff --git a/src/third_party/s2/SConscript b/src/third_party/s2/SConscript
index 830dd65cedc..04536677d07 100644
--- a/src/third_party/s2/SConscript
+++ b/src/third_party/s2/SConscript
@@ -4,12 +4,17 @@ Import("env")
 
 env = env.Clone()
 
-env.SConscript( [
-	"base/SConscript",
-	"strings/SConscript",
-	"util/coding/SConscript",
-	"util/math/SConscript",
-        ], exports={ 'env' : env })
+env.SConscript(
+    dirs=[
+        "base",
+        "strings",
+        "util/coding",
+        "util/math",
+    ],
+    exports=[
+        'env',
+    ],
+)
 
 env.Append(CCFLAGS=['-DDEBUG_MODE=false'])
 
diff --git a/src/third_party/tz/SConscript b/src/third_party/tz/SConscript
index b3449b6f513..889664efb2b 100644
--- a/src/third_party/tz/SConscript
+++ b/src/third_party/tz/SConscript
@@ -1,3 +1,5 @@
 Import("env")
 
+env = env.Clone()
+
 env.Library("tz", [ "timegm.c" ])
diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript
index 8334ac0df5f..2d371526c55 100644
--- a/src/third_party/wiredtiger/SConscript
+++ b/src/third_party/wiredtiger/SConscript
@@ -7,6 +7,7 @@ Import("get_option")
 Import("endian")
 
 env = env.Clone()
+
 env.InjectThirdPartyIncludePaths(libraries=['snappy', 'zlib'])
 
 if endian == "big":
diff --git a/src/third_party/zlib-1.2.8/SConscript b/src/third_party/zlib-1.2.8/SConscript
index 8bdc06a2bb4..3b98cf6ef0b 100644
--- a/src/third_party/zlib-1.2.8/SConscript
+++ b/src/third_party/zlib-1.2.8/SConscript
@@ -2,6 +2,7 @@
 Import("env")
 
 env = env.Clone()
+
 env.Append(CPPDEFINES=["HAVE_STDARG_H"])
 if not env.TargetOSIs('windows'):
     env.Append(CPPDEFINES=["HAVE_UNISTD_H"])