BUG: fix MSVC_USE_SCRIPT=False case.

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

diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 130acf5d5803e5046d736bdf5d391a5761943bb4..1cd236dc614d70235c77366058f5874c23c5923b 100644 (file)
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -286,8 +286,11 @@ def msvc_setup_env(env):
                   (script, arg, str(e))
             raise SCons.Errors.UserError(msg)
     else:
-        debug('msvc.get_default_env()\n')
-        d = msvc.get_default_env()
+        debug('MSVC_USE_SCRIPT set to False')
+        warn_msg = "MSVC_USE_SCRIPT set to False, assuming environment " \
+                   "set correctly."
+        SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg)
+        return None
 
     for k, v in d.items():
         env.PrependENVPath(k, v, delete_existing=True)