summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-07-12 13:39:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-07-12 15:19:33 (GMT)
commit37a83e858dd3724608c2c5265336e466fcd23e84 (patch)
treecfdf9c169229b47188075bbf54fad2cb2f23a80a /BuildTools
parent1b4b09b83eeff9369aa7809b7755a3e1dd6c0029 (diff)
downloadswift-37a83e858dd3724608c2c5265336e466fcd23e84.zip
swift-37a83e858dd3724608c2c5265336e466fcd23e84.tar.bz2
Add temporary workaround for VS2012 support.
Change-Id: Iecd927ceb0c7146af3e7a2b99b6ff0d6cf3b619f
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConscript.boot6
1 files changed, 6 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 1a32488..9f624da 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -85,6 +85,12 @@ else :
Help(vars.GenerateHelpText(env))
+# Workaround for missing Visual Studio 2012 support in SCons
+# Requires scons to be run from a VS2012 console
+if env.get("MSVC_VERSION", "").startswith("11.0") :
+ env["ENV"]["LIB"] = os.environ["LIB"]
+ env["ENV"]["INCLUDE"] = os.environ["INCLUDE"]
+
# Default environment variables
env["PLATFORM_FLAGS"] = {
"LIBPATH": [],