From a19e8ebe9f68d295719dbc7938d9560dab1ab6e5 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Sun, 24 Feb 2019 02:47:25 +0900 Subject: 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 Reviewed-By: Sam Roberts --- deps/openssl/openssl_no_asm.gypi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'deps/openssl/openssl_no_asm.gypi') 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'], }, { -- cgit v1.2.3