build universal binary

Author: baileympearson

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
   host_tests:
     strategy:
       matrix:
-        os: [macos-latest, windows-2019]
+        os: [macos-latest, windows-2019, macos-13]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
   host_tests:
     strategy:
       matrix:
-        os: [macos-latest, windows-2019]
+        os: [macos-latest, windows-2019, macos-13]
         node: [16.20.1, 18.x, 20.x, 22.x]
       fail-fast: false
     runs-on: ${{ matrix.os }}

binding.gyp

@@ -34,6 +34,19 @@
               ]
             },
           }
+        ],
+        ['OS=="mac"', {
+          'xcode_settings': {
+            "OTHER_CFLAGS": [
+              "-arch x86_64",
+              "-arch arm64"
+            ],
+            "OTHER_LDFLAGS": [
+              "-arch x86_64",
+              "-arch arm64"
+            ]
+          }
+        }
         ]
       ],
     'cflags!': [ '-fno-exceptions' ],

etc/install-zstd.sh

@@ -20,7 +20,7 @@ build_zstd() {
 
 	# CMAKE_RC_FLAGS is a workaround for a bug in 1.5.6 that breaks compilation on windows.
 	# The fix is merged but not yet released. see https://github.com/facebook/zstd/issues/3999
-	cmake -DCMAKE_RC_FLAGS="$(pwd)/lib" -DZSTD_MULTITHREAD_SUPPORT=OFF -DZSTD_BUILD_SHARED=OFF .
+	cmake -DCMAKE_RC_FLAGS="$(pwd)/lib" -DZSTD_MULTITHREAD_SUPPORT=OFF -DZSTD_BUILD_SHARED=OFF -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 .
 	cmake --build .
 }