deps: use clang gyp variable and enable -mssse3 on Windows too

nodejs · May 7, 2024 · a0ba0e0 · a0ba0e0
1 parent 57b44a5
commit a0ba0e0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp
@@ -7,7 +7,6 @@
     'ZLIB_ROOT': '.',
     'use_system_zlib%': 0,
     'arm_fpu%': '',
-    'llvm_version%': '0.0',
   },
   'conditions': [
     ['use_system_zlib==0', {
@@ -24,11 +23,16 @@
                 },{
                   'defines': [ 'X86_NOT_WINDOWS' ],
                 }],
-                ['OS!="win" or llvm_version!="0.0"', {
+                ['clang==1', {
                   'cflags': [ '-mssse3' ],
                   'xcode_settings': {
                     'OTHER_CFLAGS': [ '-mssse3' ],
                   },
+                  'msvs_settings': {
+                    'VCCLCompilerTool': {
+                      'AdditionalOptions': [ '-mssse3' ],
+                    },
+                  },
                 }],
               ],
             }],
@@ -65,7 +69,7 @@
           'conditions': [
             ['OS!="ios"', {
               'conditions': [
-                ['OS!="win" and llvm_version=="0.0"', {
+                ['OS!="win" and clang==1', {
                   'cflags': [ '-march=armv8-a+aes+crc' ],
                 }],
                 ['OS=="android"', {
@@ -111,7 +115,7 @@
         #   'target_name': 'zlib_crc32_simd',
         #   'type': 'static_library',
         #   'conditions': [
-        #     ['OS!="win" or llvm_version!="0.0"', {
+        #     ['OS!="win" or clang==1', {
         #       'cflags': [
         #         '-msse4.2',
         #         '-mpclmul',