Skip to content

Commit 6ac47aa

Browse files
committed
build,win: try next MSVS version on failure
This is a port of e07c86e from v0.12. Original commit message: Try the next version of Microsoft Visual Studio when vcvarsall.bat fails to set VCINSTALLDIR. PR-URL: #2843 Reviewed-By: rvagg - Rod Vagg <rod@vagg.org> Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org> Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl> PR-URL: #2910 Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org> Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
1 parent c88a0b2 commit 6ac47aa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

vcbuild.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ if defined msi (
9797
)
9898
)
9999
call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
100-
if not defined VCINSTALLDIR goto msbuild-not-found
100+
if not defined VCINSTALLDIR goto vc-set-2013
101101
set GYP_MSVS_VERSION=2015
102102
set PLATFORM_TOOLSET=v140
103103
goto msbuild-found
@@ -117,7 +117,7 @@ if defined msi (
117117
)
118118
)
119119
call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat"
120-
if not defined VCINSTALLDIR goto msbuild-not-found
120+
if not defined VCINSTALLDIR goto vc-set-2012
121121
set GYP_MSVS_VERSION=2013
122122
set PLATFORM_TOOLSET=v120
123123
goto msbuild-found
@@ -136,7 +136,7 @@ if defined msi (
136136
)
137137
)
138138
call "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat"
139-
if not defined VCINSTALLDIR goto msbuild-not-found
139+
if not defined VCINSTALLDIR goto vc-set-2010
140140
set GYP_MSVS_VERSION=2012
141141
set PLATFORM_TOOLSET=v110
142142
goto msbuild-found

0 commit comments

Comments
 (0)