diff options
| author | Brian Ingenito <28159742+bingenito@users.noreply.github.com> | 2020-11-07 00:18:36 +0300 |
|---|---|---|
| committer | Beth Griggs <bgriggs@redhat.com> | 2020-12-15 23:15:19 +0300 |
| commit | 6bafe04911baafb5415fd70f27e9e6bfe5b3fe5d (patch) | |
| tree | 97ecd2be2b1348a56de16bc44b5da34ce625ebae /vcbuild.bat | |
| parent | 3029872631ba22a8ee45a055a1a6b1a08cb1af29 (diff) | |
build: conditionally clear vcinstalldir
For scenario where target env is explicitly specified as vs2019, do
not clear VCINSTALLDIR which was being cleared to handle fallback to
vs2017 block when attempting to find a matching available VS.
Fixes: https://github.com/nodejs/node/issues/35856
PR-URL: https://github.com/nodejs/node/pull/36009
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 292e05a93f8..7b730523dc2 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -248,7 +248,7 @@ echo Looking for Visual Studio 2019 @rem VCINSTALLDIR may be set if run from a VS Command Prompt and needs to be @rem cleared first as vswhere_usability_wrapper.cmd doesn't when it fails to @rem detect the version searched for -set "VCINSTALLDIR=" +if not defined target_env set "VCINSTALLDIR=" call tools\msvs\vswhere_usability_wrapper.cmd "[16.0,17.0)" if "_%VCINSTALLDIR%_" == "__" goto vs-set-2017 set "WIXSDKDIR=%WIX%\SDK\VS2017" |