From 9575744cc0b76d075936f1dec6f48990afac7c36 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 7 Feb 2010 00:31:10 +0000 Subject: Fix the case where neither vc nor sdk script exist or, vc doesn't work and sdk doesn't exist. --- src/engine/SCons/Tool/MSCommon/vc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 5350216..d13d595 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -375,7 +375,7 @@ def msvc_setup_env(env): except BatchFileExecutionError,e: debug('use_script 5: failed running SDK script %s: Error:%s'%(repr(sdk_script),e)) return None - else: + elif not vc_script and not sdk_script: debug('use_script 6: Neither VC script nor SDK script found') return None -- cgit v0.12