diff options
| author | Jon Kunkee <jkunkee@microsoft.com> | 2019-07-08 18:02:20 -0700 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2019-07-15 16:05:41 +0100 |
| commit | c3caf21bd35359fe8b0470a65775ade5979890f7 (patch) | |
| tree | 8c071e2069f004fad9208def4fb9545b94521b95 /deps/npm/node_modules/node-gyp/lib/configure.js | |
| parent | d53144e549598ae1ce36ba643e2fc70edacfd2e1 (diff) | |
| download | android-node-v8-c3caf21bd35359fe8b0470a65775ade5979890f7.tar.gz android-node-v8-c3caf21bd35359fe8b0470a65775ade5979890f7.tar.bz2 android-node-v8-c3caf21bd35359fe8b0470a65775ade5979890f7.zip | |
deps: cherry-pick 91744bf 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:
gyp: add support for Windows on Arm
Cherry-pick of https://github.com/refack/GYP/pull/33, supersedes
https://github.com/nodejs/node-gyp/pull/1678 until GYP3 is merged.
`npm test` passes
Change-Id: I2b1e1e03e378b4812d34afa527087793864d1576
PR-URL: https://github.com/nodejs/node-gyp/pull/1739
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: João Reis <reis@janeasystems.com>
Refs: https://github.com/nodejs/node-gyp/commit/91744bfecc67fda7db58e2a1c7aa72f196d6da4f
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/node_modules/node-gyp/lib/configure.js')
| -rw-r--r-- | deps/npm/node_modules/node-gyp/lib/configure.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/deps/npm/node_modules/node-gyp/lib/configure.js b/deps/npm/node_modules/node-gyp/lib/configure.js index 6ff19559cd..88444dc5e1 100644 --- a/deps/npm/node_modules/node-gyp/lib/configure.js +++ b/deps/npm/node_modules/node-gyp/lib/configure.js @@ -142,6 +142,9 @@ function configure (gyp, argv, callback) { // set the target_arch variable variables.target_arch = gyp.opts.arch || process.arch || 'ia32' + if (variables.target_arch == 'arm64') { + defaults['msvs_configuration_platform'] = 'ARM64' + } // set the node development directory variables.nodedir = nodeDir |