SERVER-37609 Update SCons toolchain files to reflect update to v3

6 files changed, 4 insertions, 52 deletions

diff --git a/etc/scons/mongodbtoolchain_clang.vars b/etc/scons/mongodbtoolchain_clang.vars
deleted file mode 100644
index b9896888614..00000000000
--- a/etc/scons/mongodbtoolchain_clang.vars
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configures the build to use the Clang toolchain in /opt/mongodbtoolchain/v2
-
-import os
-import subprocess
-import SCons.Defaults
-
-# Get the default SCons path as a list
-default_path = SCons.Defaults.DefaultEnvironment()['ENV']['PATH'].split(os.pathsep)
-
-# Put the toolchain path first so we prefer all tools from there in subprocs.
-ENV = {
-    'PATH' : os.pathsep.join(['/opt/mongodbtoolchain/v2/bin'] + default_path)
-}
-
-# Set any Variables for Tools from the toolchain here. Technically, we
-# shouldn't need the full paths since SCons will find the toolchain
-# ones first, but we don't want to accidentally get the system version
-# if, say, the toolchain is missing. Also, it is clearer that we are
-# getting the right toolchain in build log output when the path is
-# printed for each compiler invocation.
-CC = '/opt/mongodbtoolchain/v2/bin/clang'
-CXX = '/opt/mongodbtoolchain/v2/bin/clang++'
-AR = subprocess.check_output([CXX, '-print-prog-name=ar']).strip()
-OBJCOPY = '/opt/mongodbtoolchain/v2/bin/objcopy'
diff --git a/etc/scons/mongodbtoolchain_gcc.vars b/etc/scons/mongodbtoolchain_gcc.vars
deleted file mode 100644
index efad8b41980..00000000000
--- a/etc/scons/mongodbtoolchain_gcc.vars
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configures the build to use the GCC toolchain in /opt/mongodbtoolchain/v2
-
-import os
-import subprocess
-import SCons.Defaults
-
-# Get the default SCons path as a list
-default_path = SCons.Defaults.DefaultEnvironment()['ENV']['PATH'].split(os.pathsep)
-
-# Put the toolchain path first so we prefer all tools from there in subprocs
-ENV = {
-    'PATH' : os.pathsep.join(['/opt/mongodbtoolchain/v2/bin'] + default_path)
-}
-
-# Set any Variables for Tools from the toolchain here. Technically, we
-# shouldn't need the full paths since SCons will find the toolchain
-# ones first, but we don't want to accidentally get the system version
-# if, say, the toolchain is missing. Also, it is clearer that we are
-# getting the right toolchain in build log output when the path is
-# printed for each compiler invocation.
-CC = '/opt/mongodbtoolchain/v2/bin/gcc'
-CXX = '/opt/mongodbtoolchain/v2/bin/g++'
-AR = subprocess.check_output([CXX, '-print-prog-name=ar']).strip()
-OBJCOPY = '/opt/mongodbtoolchain/v2/bin/objcopy'
diff --git a/etc/scons/mongodbtoolchain_stable_clang.vars b/etc/scons/mongodbtoolchain_stable_clang.vars
index 096496f5242..de76357a199 100644
--- a/etc/scons/mongodbtoolchain_stable_clang.vars
+++ b/etc/scons/mongodbtoolchain_stable_clang.vars
@@ -1,2 +1,2 @@
 
-execfile('etc/scons/mongodbtoolchain_clang.vars')
+execfile('etc/scons/mongodbtoolchain_v3_clang.vars')
diff --git a/etc/scons/mongodbtoolchain_stable_gcc.vars b/etc/scons/mongodbtoolchain_stable_gcc.vars
index 66a62e568c0..a3a799d6fc2 100644
--- a/etc/scons/mongodbtoolchain_stable_gcc.vars
+++ b/etc/scons/mongodbtoolchain_stable_gcc.vars
@@ -1,2 +1,2 @@
 
-execfile('etc/scons/mongodbtoolchain_gcc.vars')
+execfile('etc/scons/mongodbtoolchain_v3_gcc.vars')
diff --git a/etc/scons/mongodbtoolchain_testing_clang.vars b/etc/scons/mongodbtoolchain_testing_clang.vars
index de76357a199..099cb80764b 100644
--- a/etc/scons/mongodbtoolchain_testing_clang.vars
+++ b/etc/scons/mongodbtoolchain_testing_clang.vars
@@ -1,2 +1,2 @@
 
-execfile('etc/scons/mongodbtoolchain_v3_clang.vars')
+execfile('etc/scons/mongodbtoolchain_stable_clang.vars')
diff --git a/etc/scons/mongodbtoolchain_testing_gcc.vars b/etc/scons/mongodbtoolchain_testing_gcc.vars
index a3a799d6fc2..c52cd08cd32 100644
--- a/etc/scons/mongodbtoolchain_testing_gcc.vars
+++ b/etc/scons/mongodbtoolchain_testing_gcc.vars
@@ -1,2 +1,2 @@
 
-execfile('etc/scons/mongodbtoolchain_v3_gcc.vars')
+execfile('etc/scons/mongodbtoolchain_stable_gcc.vars')