From 01d2fabda95f92d5cbe7bcc77560c192a3a36e0e Mon Sep 17 00:00:00 2001 From: cournape Date: Thu, 19 Nov 2009 04:56:55 +0000 Subject: [PATCH] BUG: do not call msvs bat file in merge_default_version, only set up version. git-svn-id: http://scons.tigris.org/svn/scons/trunk@4441 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- 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 9b6eb7c5..4fda0db6 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 -- 2.26.2