diff options
author | Remko Tronçon <git@el-tramo.be> | 2012-10-07 09:18:38 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2012-10-07 09:35:54 (GMT) |
commit | 7bc23de0231e88972b15753684ead68311b148e3 (patch) | |
tree | e76cd3abfcbc5776dfd474a3f38ff954eba98c62 /BuildTools/SCons | |
parent | 50b3239ae60e2c1f5fb74d6ac566aeb3e4110400 (diff) | |
download | swift-7bc23de0231e88972b15753684ead68311b148e3.zip swift-7bc23de0231e88972b15753684ead68311b148e3.tar.bz2 |
Make it possible to force visual studio version.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r-- | BuildTools/SCons/SConscript.boot | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index a5474bf..64cdb63 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -64,10 +64,14 @@ vars.Add(BoolVariable("set_iterator_debug_level", "Set _ITERATOR_DEBUG_LEVEL=0", # Set up default build & configure environment ################################################################################ -env = Environment(ENV = { - 'PATH' : os.environ['PATH'], - 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""), - }, variables = vars) +env_ENV = { + 'PATH' : os.environ['PATH'], + 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""), +} +if "MSVC_VERSION" in ARGUMENTS : + env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"]) +else : + env = Environment(ENV = env_ENV, variables = vars) Help(vars.GenerateHelpText(env)) |