diff options
| author | Refael Ackermann <refack@gmail.com> | 2017-06-19 20:11:22 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2017-07-09 13:21:33 -0400 |
| commit | 8206a01c99ed929327365a16915233a867c54aed (patch) | |
| tree | 6163b954b1513ac0c9d441aaef483f33058415c4 /vcbuild.bat | |
| parent | d69ecc6f51855574b8f0af1004e6d0ffd9b20c7a (diff) | |
| download | android-node-v8-8206a01c99ed929327365a16915233a867c54aed.tar.gz android-node-v8-8206a01c99ed929327365a16915233a867c54aed.tar.bz2 android-node-v8-8206a01c99ed929327365a16915233a867c54aed.zip | |
build,win: skip `vcvarsall.bat` if env is set
PR-URL: https://github.com/nodejs/node/pull/13806
Fixes: https://github.com/nodejs/node/issues/13765
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index a1c011780c..0af8047e4a 100644 --- 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 |