From 62177ebc4d740015873796ee9d45b73be83cebef Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 13 Mar 2014 02:19:01 +0000
Subject: [PATCH] [SCons] Improve detection of MinGW as the default compiler

---
 SConstruct | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 9b0920a03..a641ac436 100644
--- a/SConstruct
+++ b/SConstruct
@@ -88,6 +88,12 @@ if os.name == 'nt':
     else:
         target_arch = 'x86'
 
+    # Make an educated guess about the right default compiler
+    if which('g++') and not which('cl.exe'):
+        defaultToolchain = 'mingw'
+    else:
+        defaultToolchain = 'msvc'
+
     windows_compiler_options.extend([
         ('msvc_version',
          """Version of Visual Studio to use. The default is the same version
@@ -100,7 +106,7 @@ if os.name == 'nt':
         EnumVariable(
             'toolchain',
             """The preferred compiler toolchain.""",
-            'msvc', ('msvc', 'mingw', 'intel'))])
+            defaultToolchain, ('msvc', 'mingw', 'intel'))])
     opts.AddVariables(*windows_compiler_options)
 
     pickCompilerEnv = Environment()
@@ -121,6 +127,7 @@ if os.name == 'nt':
         toolchain = ['intelc'] # note: untested
 
     extraEnvArgs['TARGET_ARCH'] = pickCompilerEnv['target_arch']
+    print 'INFO: Compiling using the following toolchain(s):', repr(toolchain)
 
 else:
     toolchain = ['default']
@@ -135,7 +142,6 @@ env = Environment(tools=toolchain+['textfile', 'subst', 'recursiveInstall', 'wix
 #
 # print env.Dump()
 
-
 env['OS'] = platform.system()
 env['OS_BITS'] = int(platform.architecture()[0][:2])
 if 'cygwin' in env['OS'].lower():