summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl_no_asm.gypi
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2019-02-24 02:47:25 +0900
committerRuben Bridgewater <ruben@bridgewater.de>2019-04-04 15:11:44 +0200
commita19e8ebe9f68d295719dbc7938d9560dab1ab6e5 (patch)
tree83377b59380e4fd0f2e46ebf5fd7cc6a79a9590a /deps/openssl/openssl_no_asm.gypi
parent4f094c0ae60beb8a3eb569a6a2d8c608bff1dbeb (diff)
downloadandroid-node-v8-a19e8ebe9f68d295719dbc7938d9560dab1ab6e5.tar.gz
android-node-v8-a19e8ebe9f68d295719dbc7938d9560dab1ab6e5.tar.bz2
android-node-v8-a19e8ebe9f68d295719dbc7938d9560dab1ab6e5.zip
deps: add ARM64 Windows support in openssl
This adds ARM64 Windows support in the OpenSSL build system. Since OpenSSL's ARM64 Windows support does not have support for ASM-- that is, VC-WIN64-ARM inherits from VC-noCE-common which has no ASM files--`openssl_no_asm.gypi` is always used for building. This essentially forces the 'no-asm' Configure flag. PR-URL: https://github.com/nodejs/node/pull/26001 Fixes: https://github.com/nodejs/node/issues/25998 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Diffstat (limited to 'deps/openssl/openssl_no_asm.gypi')
-rw-r--r--deps/openssl/openssl_no_asm.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/deps/openssl/openssl_no_asm.gypi b/deps/openssl/openssl_no_asm.gypi
index 2e0d963959..d09f944539 100644
--- a/deps/openssl/openssl_no_asm.gypi
+++ b/deps/openssl/openssl_no_asm.gypi
@@ -38,6 +38,8 @@
'includes': ['config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi'],
}, 'target_arch=="x64" and OS=="win"', {
'includes': ['config/archs/VC-WIN64A/no-asm/openssl.gypi'],
+ }, 'target_arch=="arm64" and OS=="win"', {
+ 'includes': ['config/archs/VC-WIN64-ARM/no-asm/openssl.gypi'],
}, 'target_arch=="x64" and OS=="linux"', {
'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
}, {