chore: enable ARM64 build for macOS

metaopt · Oct 31, 2022 · 0ec46c2 · 0ec46c2
1 parent 7979053
commit 0ec46c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -117,6 +117,7 @@ jobs:
         uses: pypa/[email protected]
         env:
           CIBW_BUILD: ${{ env.CIBW_BUILD }}
+          CIBW_ARCHS_MACOS: x86_64 arm64 universal2
         with:
           package-dir: .
           output-dir: wheelhouse
@@ -168,6 +169,7 @@ jobs:
         uses: pypa/[email protected]
         env:
           CIBW_BUILD: ${{ env.CIBW_BUILD }}
+          CIBW_ARCHS_MACOS: x86_64 arm64 universal2
         with:
           package-dir: .
           output-dir: wheelhouse

diff --git a/setup.py b/setup.py
@@ -1,5 +1,6 @@
 import os
 import pathlib
+import platform
 import shutil
 import sys
 import sysconfig
@@ -53,6 +54,12 @@ def build_extension(self, ext):
             f'-DPYTHON_INCLUDE_DIR={sysconfig.get_path("platinclude")}',
         ]
 
+        if platform.system() == 'Darwin':
+            # Cross-compile support for macOS - respect ARCHFLAGS if set
+            archs = re.findall(r'-arch (\S+)', os.environ.get('ARCHFLAGS', ''))
+            if archs:
+                cmake_args.append('-DCMAKE_OSX_ARCHITECTURES={}'.format(';'.join(archs)))
+
         try:
             import pybind11