summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-11-19 04:56:55 (GMT)
committerDavid Cournapeau <cournape@gmail.com>2009-11-19 04:56:55 (GMT)
commit42e13c090772ab22fb5b7700f8fa5932d0501399 (patch)
tree703ea6c354227786b78df05fb8a592ef1937350e /src/engine
parent67b21c8cb7dc3daa506bde8408653aec6f2298b7 (diff)
downloadSCons-42e13c090772ab22fb5b7700f8fa5932d0501399.zip
SCons-42e13c090772ab22fb5b7700f8fa5932d0501399.tar.gz
SCons-42e13c090772ab22fb5b7700f8fa5932d0501399.tar.bz2
BUG: do not call msvs bat file in merge_default_version, only set up version.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vs.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py
index 9b6eb7c..4fda0db 100644
--- a/src/engine/SCons/Tool/MSCommon/vs.py
+++ b/src/engine/SCons/Tool/MSCommon/vs.py
@@ -457,10 +457,11 @@ def merge_default_version(env):
version = get_default_version(env)
arch = get_default_arch(env)
+def msvs_setup_env(env):
+ batfilename = msvs.get_batch_file()
msvs = get_vs_by_version(version)
if msvs is None:
return
- batfilename = msvs.get_batch_file()
# XXX: I think this is broken. This will silently set a bogus tool instead
# of failing, but there is no other way with the current scons tool