Don't attempt to pass GCC-style flags to MSVC

holepunchto · Jan 26, 2024 · 1a8090d · 1a8090d
1 parent ea85352
commit 1a8090d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -212,17 +212,19 @@ target_include_directories(
     vendor/libsodium/src/libsodium/include/sodium
 )
 
-target_compile_options(
-  sodium
-  PRIVATE
-    -fvisibility=hidden
-    -fno-strict-aliasing
-    -fwrapv
-    -flax-vector-conversions
-    -Wno-unused-function
-    -Wno-unknown-pragmas
-    -Wno-unused-but-set-variable
-)
+if(NOT target MATCHES "win32")
+  target_compile_options(
+    sodium
+    PRIVATE
+      -fvisibility=hidden
+      -fno-strict-aliasing
+      -fwrapv
+      -flax-vector-conversions
+      -Wno-unused-function
+      -Wno-unknown-pragmas
+      -Wno-unused-but-set-variable
+  )
+endif()
 
 target_compile_definitions(
   sodium

diff --git a/vendor/libsodium.gyp b/vendor/libsodium.gyp
@@ -32,15 +32,6 @@
         '-Wno-unused-but-set-variable',
       ],
     },
-    'cflags': [
-      '-fvisibility=hidden',
-      '-fno-strict-aliasing',
-      '-fwrapv',
-      '-flax-vector-conversions',
-      '-Wno-unused-function',
-      '-Wno-unknown-pragmas',
-      '-Wno-unused-but-set-variable',
-    ],
     'sources': [
       './libsodium/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c',
       './libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c',
@@ -219,6 +210,16 @@
           'HAVE_RAISE=1',
           'HAVE_SYS_PARAM_H=1',
         ],
+      }, {
+        'cflags': [
+          '-fvisibility=hidden',
+          '-fno-strict-aliasing',
+          '-fwrapv',
+          '-flax-vector-conversions',
+          '-Wno-unused-function',
+          '-Wno-unknown-pragmas',
+          '-Wno-unused-but-set-variable',
+        ],
       }],
       ['target_arch=="x64"', {
         'defines': [