Fix the case where neither vc nor sdk script exist or, vc doesn't work and sdk doesn...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4665 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 53502167a64215352f1be72c67a8a7a4a6b6d1a2..d13d59585b9c79dc66d3df87bc40923df5ad5eca 100644 (file)
--- 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