summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-04-12 00:08:05 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-04-12 00:08:05 (GMT)
commitb94470116ca5cb31cb9f9737adf24ea9b69b0f55 (patch)
tree809b3e20ee79eef7f6331fc9b9e8657f37ea73e7 /src
parentb2596f777bbcc6cea3d792dd4cbfa580981cb93b (diff)
downloadSCons-b94470116ca5cb31cb9f9737adf24ea9b69b0f55.zip
SCons-b94470116ca5cb31cb9f9737adf24ea9b69b0f55.tar.gz
SCons-b94470116ca5cb31cb9f9737adf24ea9b69b0f55.tar.bz2
Address PR comments
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py2
-rw-r--r--src/engine/SCons/Tool/msvc.xml10
2 files changed, 5 insertions, 7 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index ce1341d..456ccae 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -338,8 +338,6 @@ def msvc_find_vswhere():
# For bug 3542: also accommodate not being on C: drive.
# NB: this gets called from testsuite on non-Windows platforms.
# Whether that makes sense or not, don't break it for those.
- # TODO: requested to add a user-specified path to vswhere
- # and have this routine set the same var if it finds it.
vswhere_path = None
for pf in VSWHERE_PATHS:
if os.path.exists(pf):
diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml
index bdbf253..3e8ec95 100644
--- a/src/engine/SCons/Tool/msvc.xml
+++ b/src/engine/SCons/Tool/msvc.xml
@@ -487,14 +487,14 @@ It was initially distributed with MSVS 2017. But can detect MSVC 2010 and newer
If &cv-VSWHERE; is set, SCons will use that location.
</para>
<para>
-Otherwise SCons will look in the following locations and set VSWHERE to the PATH <literal>vswhere.exe</literal>
-is located.
+Otherwise SCons will look in the following locations and set VSWHERE to the first directory <literal>vswhere.exe</literal>
+is found.
</para>
<para>
-Note that &cv-VSWHERE; must be set in when tool msvc is initialized. This is either in the call to
+Note that &cv-VSWHERE; must be set at the same time or prior to the msvc tool being initialized. So either set it as follows
<literal>Environment(VSWHERE='c:/my/path/to/vswhere')</literal> or
-if Environment created specifying not to automatically initialize any tools or tools which doesn't include msvc or MSVS
-such as <literal>Environment(Tools=[])</literal>
+if your Environment() is created specifying no tools <literal>tools=[]</literal> or with a list of tools not including msvs or msvc or mslink
+ such as <literal>Environment(Tools=[])</literal>
</para>