Fix up osx-arm64 wheel (#224)

* build libspatialindex with MACOS archs * no universal2 for cmake
Toblerity · Feb 22, 2022 · aecb530 · aecb530
1 parent 1caba8a
commit aecb530
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -135,7 +135,7 @@ jobs:
       MACOSX_DEPLOYMENT_TARGET: 10.9
       CIBW_BUILD_VERBOSITY_MACOS: 3
       CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64"
-      CIBW_ARCHS_MACOS: "x86_64 universal2  arm64"
+      CIBW_ARCHS_MACOS: "x86_64 arm64"
       CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: ""
       CIBW_BEFORE_BUILD_LINUX: "pip install cmake; bash {project}/ci/install_libspatialindex.bash"
     strategy:

diff --git a/ci/install_libspatialindex.bash b/ci/install_libspatialindex.bash
@@ -45,7 +45,7 @@ cd build
 
 cp "${SL}/CMakeLists.txt" ..
 
-cmake -DCMAKE_BUILD_TYPE=Release ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="${CIBW_ARCHS_MACOS/ /;}" ..
 make -j 4
 
 # copy built libraries relative to path of this script