summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2010-02-07 00:31:10 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2010-02-07 00:31:10 (GMT)
commit9575744cc0b76d075936f1dec6f48990afac7c36 (patch)
treec36c83580f706df4c616cfd2e2cf025869507c49 /src
parentca579c1efd252ea31d3c65b516fdc41d1237dafe (diff)
downloadSCons-9575744cc0b76d075936f1dec6f48990afac7c36.zip
SCons-9575744cc0b76d075936f1dec6f48990afac7c36.tar.gz
SCons-9575744cc0b76d075936f1dec6f48990afac7c36.tar.bz2
Fix the case where neither vc nor sdk script exist or, vc doesn't work and sdk doesn't exist.
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py2
1 files changed, 1 insertions, 1 deletions
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