Fixes for arch flags and unusable architecture

nipy · Nov 8, 2023 · f55e891 · f55e891
1 parent 64d4dd4
commit f55e891
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/wheels-linux.yml b/.github/workflows/wheels-linux.yml
@@ -22,8 +22,6 @@ jobs:
       fail-fast: false
       matrix:
         python: [
-          "pypy3.9-7.3.12",
-          "pypy3.10-7.3.12",
           "3.8",
           "3.9",
           "3.10",
@@ -33,9 +31,6 @@ jobs:
         mb-ml-libc: [ "manylinux" ]
         mb-ml-ver: [ 2014, "_2_28" ]
         include:
-          - python: "3.8"
-            mb-ml-libc: "musllinux"
-            mb-ml-ver: "_1_1"
           - python: "3.9"
             mb-ml-libc: "musllinux"
             mb-ml-ver: "_1_1"

diff --git a/config.sh b/config.sh
@@ -1,12 +1,22 @@
 # Define custom utilities
 # Test for OSX with [ -n "$IS_MACOS" ]
 
+function clean_arch_flags {
+    # Clean up potential duplicate arch flags
+    if [[ $ARCH_FLAGS =~ "-arch arm64" ]]; then
+        export ARCH_FLAGS="-arch arm64"
+    elif [[ $ARCH_FLAGS =~ "-arch x86_64" ]]; then
+        export ARCH_FLAGS="-arch x86_64"
+    fi
+}
+
 function pre_build {
     # Any stuff that you need to do before you start
     # building the wheels.
     # Runs in the root directory of this repository.
     # Workaround for Accelerate error; only on macOS.
     if [ -z "$IS_MACOS" ]; then return; fi
+    clean_arch_flags
     brew install openblas
 }