Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit fbe210b

Browse filesBrowse files
bingenitocodebytere
bingenito
authored and
codebytere
committed
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: #35856 PR-URL: #36009 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 6a4cc43 commit fbe210b
Copy full SHA for fbe210b

File tree

Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed
Open diff view settings
Collapse file

‎vcbuild.bat‎

Copy file name to clipboardExpand all lines: vcbuild.bat
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ echo Looking for Visual Studio 2019
249249
@rem VCINSTALLDIR may be set if run from a VS Command Prompt and needs to be
250250
@rem cleared first as vswhere_usability_wrapper.cmd doesn't when it fails to
251251
@rem detect the version searched for
252-
set "VCINSTALLDIR="
252+
if not defined target_env set "VCINSTALLDIR="
253253
call tools\msvs\vswhere_usability_wrapper.cmd "[16.0,17.0)"
254254
if "_%VCINSTALLDIR%_" == "__" goto msbuild-not-found
255255
set "WIXSDKDIR=%WIX%\SDK\VS2017"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.