diff options
| author | Jon Kunkee <jkunkee@microsoft.com> | 2019-07-10 12:03:20 -0700 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2019-07-15 16:04:39 +0100 |
| commit | d53144e549598ae1ce36ba643e2fc70edacfd2e1 (patch) | |
| tree | 4bac3d085bafce963e3bf7bd3819b5f0fffe67a3 /deps/npm | |
| parent | e984917aaf161d810ff1acaf2f4b5e4e0b345315 (diff) | |
| download | android-node-v8-d53144e549598ae1ce36ba643e2fc70edacfd2e1.tar.gz android-node-v8-d53144e549598ae1ce36ba643e2fc70edacfd2e1.tar.bz2 android-node-v8-d53144e549598ae1ce36ba643e2fc70edacfd2e1.zip | |
deps: cherry-pick 721dc7d from node-gyp upstream
This change cherry-picks a small set of node-gyp v5.0.0 changes needed
to enable Node.js ARM64 Windows builds.
Original commit message:
Add ARM64 to MSBuild /Platform logic
PR-URL: https://github.com/nodejs/node-gyp/pull/1655
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: João Reis <reis@janeasystems.com>
Refs: https://github.com/nodejs/node-gyp/commit/721dc7d3148ab71ee283d9cb15df84d9b87b7efc
PR-URL: https://github.com/nodejs/node/pull/28604
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: João Reis <reis@janeasystems.com>
Diffstat (limited to 'deps/npm')
| -rw-r--r-- | deps/npm/node_modules/node-gyp/lib/build.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/deps/npm/node_modules/node-gyp/lib/build.js b/deps/npm/node_modules/node-gyp/lib/build.js index 2f8e14c374..fdb328b842 100644 --- a/deps/npm/node_modules/node-gyp/lib/build.js +++ b/deps/npm/node_modules/node-gyp/lib/build.js @@ -210,9 +210,13 @@ function build (gyp, argv, callback) { // Specify the build type, Release by default if (win) { + // Convert .gypi config target_arch to MSBuild /Platform + // Since there are many ways to state '32-bit Intel', default to it. + // N.B. msbuild's Condition string equality tests are case-insensitive. var archLower = arch.toLowerCase() var p = archLower === 'x64' ? 'x64' : - (archLower === 'arm' ? 'ARM' : 'Win32') + (archLower === 'arm' ? 'ARM' : + (archLower === 'arm64' ? 'ARM64' : 'Win32')) argv.push('/p:Configuration=' + buildType + ';Platform=' + p) if (jobs) { var j = parseInt(jobs, 10) |