summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-11-19 05:08:16 (GMT)
committerDavid Cournapeau <cournape@gmail.com>2009-11-19 05:08:16 (GMT)
commit6f60318aaa92e8704f0d103832fe95b2dc98ea28 (patch)
tree7b611c71f904bbe23a7b7bbe70687a37936a403d /src
parent917693d962720cce08ac733bd568b0900593704f (diff)
downloadSCons-6f60318aaa92e8704f0d103832fe95b2dc98ea28.zip
SCons-6f60318aaa92e8704f0d103832fe95b2dc98ea28.tar.gz
SCons-6f60318aaa92e8704f0d103832fe95b2dc98ea28.tar.bz2
BUG: fix MSVC_USE_SCRIPT=False case.
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 130acf5..1cd236d 100644
--- 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)