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]>
nodejs · Jul 9, 2017 · 8206a01 · 8206a01
1 parent d69ecc6
commit 8206a01
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/vcbuild.bat b/vcbuild.bat
@@ -200,9 +200,12 @@ if defined msi (
     goto wix-not-found
   )
 )
-@rem VS2015 vsvarsall is quick, so run anyway
+
+@rem check if VS2015 is already setup
+if "_%VisualStudioVersion%_" == "_14.0_" if "_%VCVARS_VER%_" == "_140_" goto found_vs2015
 call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
 SET VCVARS_VER=140
+:found_vs2015
 if not defined VCINSTALLDIR goto msbuild-not-found
 @rem Visual C++ Build Tools 2015 does not define VisualStudioVersion
 echo Found MSVS version 14.0