SERVER-9562 Add better detection of toolchain/arch

4 files changed, 5 insertions, 13 deletions

diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript
index 6468bd9d155..fd056336b23 100644
--- a/src/mongo/installer/msi/SConscript
+++ b/src/mongo/installer/msi/SConscript
@@ -54,7 +54,7 @@ else:
     msi_edition = 'SSL'
   else:
     msi_edition = 'Standard'
-  if env['PROCESSOR_ARCHITECTURE'] == 'i386':
+  if env['TARGET_ARCH'] == 'i386':
     msi_platform = 'x86'
     msi_flavor = ''
     upgrade_code = 'B2E70C13-483E-4E16-B6AA-FCCA7983B767'
diff --git a/src/third_party/s2/SConscript b/src/third_party/s2/SConscript
index 3c57cdb1d58..fb1137f12d4 100644
--- a/src/third_party/s2/SConscript
+++ b/src/third_party/s2/SConscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 
-Import("env windows linux darwin solaris use_clang")
+Import("env windows linux darwin solaris")
 
 env = env.Clone()
 
@@ -17,7 +17,7 @@ env.Append(CCFLAGS=['-DDEBUG_MODE=false'])
 # not a problem on Windows, these mismatches can be ignored
 # http://stackoverflow.com/questions/4866425/mixing-class-and-struct. W
 # warning so it doesn't become an error.
-if use_clang:
+if env.ToolchainIs('clang'):
     env.Append(CCFLAGS=['-Wno-mismatched-tags'])
 
 env.Library( "s2",
diff --git a/src/third_party/v8-3.25/SConscript b/src/third_party/v8-3.25/SConscript
index b23989c38fa..f96216c807f 100644
--- a/src/third_party/v8-3.25/SConscript
+++ b/src/third_party/v8-3.25/SConscript
@@ -351,15 +351,11 @@ def get_flags(flag, toolchain, options):
     return ret
 
 def get_options():
-    processor = env['PROCESSOR_ARCHITECTURE']
+    processor = env['TARGET_ARCH']
     if processor == 'i386':
         arch_string = 'arch:ia32'
-    elif processor == 'i686':
-        arch_string = 'arch:ia32'
     elif processor == 'x86_64':
         arch_string = 'arch:x64'
-    elif processor == 'amd64':
-        arch_string = 'arch:x64'
     elif processor == 'aarch64':
         arch_string = 'arch:arm64'
     else:
diff --git a/src/third_party/v8/SConscript b/src/third_party/v8/SConscript
index c0289c6648d..57b6f7dce24 100644
--- a/src/third_party/v8/SConscript
+++ b/src/third_party/v8/SConscript
@@ -283,15 +283,11 @@ def get_flags(flag, toolchain, options):
     return ret
 
 def get_options():
-    processor = env['PROCESSOR_ARCHITECTURE']
+    processor = env['TARGET_ARCH']
     if processor == 'i386':
         arch_string = 'arch:ia32'
-    elif processor == 'i686':
-        arch_string = 'arch:ia32'
     elif processor == 'x86_64':
         arch_string = 'arch:x64'
-    elif processor == 'amd64':
-        arch_string = 'arch:x64'
     else:
         assert False, "Unsupported architecture: " + processor