Skip to content

Commit 897405d

Browse files
refackaddaleax
authored andcommitted
build,win: skip vcvarsall.bat if env is set
PR-URL: #13806 Fixes: #13765 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Kunal Pathak <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 217e1dc commit 897405d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

vcbuild.bat

+4-1
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,12 @@ if defined msi (
200200
goto wix-not-found
201201
)
202202
)
203-
@rem VS2015 vsvarsall is quick, so run anyway
203+
204+
@rem check if VS2015 is already setup
205+
if "_%VisualStudioVersion%_" == "_14.0_" if "_%VCVARS_VER%_" == "_140_" goto found_vs2015
204206
call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
205207
SET VCVARS_VER=140
208+
:found_vs2015
206209
if not defined VCINSTALLDIR goto msbuild-not-found
207210
@rem Visual C++ Build Tools 2015 does not define VisualStudioVersion
208211
echo Found MSVS version 14.0

0 commit comments

Comments
 (0)