From 42e13c090772ab22fb5b7700f8fa5932d0501399 Mon Sep 17 00:00:00 2001 From: David Cournapeau Date: Thu, 19 Nov 2009 04:56:55 +0000 Subject: BUG: do not call msvs bat file in merge_default_version, only set up version. --- src/engine/SCons/Tool/MSCommon/vs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v0.12