From 3ac05b75cad90e0b1ddda80c0b8c0b0eb864f1e5 Mon Sep 17 00:00:00 2001 From: Richard Townsend Date: Fri, 22 May 2020 11:40:13 +0100 Subject: [PATCH] build: zlib build error on Windows on Arm Zlib's SIMD optimizations are not supported in MSVC, so fall back to the C versions for now. PR-URL: https://github.com/nodejs/node/pull/33511 Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Shelley Vohr Reviewed-By: Ruben Bridgewater --- tools/v8_gypfiles/v8.gyp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 42adb81b470437..6f4f6fb51206fd 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -1650,7 +1650,13 @@ 'toolsets': ['host', 'target'], }], ['OS=="win"', { - 'defines': ['X86_WINDOWS'], + 'conditions': [ + ['"<(target_arch)"=="arm64" and _toolset=="target"', { + 'defines': ['CPU_NO_SIMD'] + }, { + 'defines': ['X86_WINDOWS'] + }] + ] }], ], 'direct_dependent_settings': {