setup.py: arm64 macOS fixes

- Passing --target to CFLAGS and LDFLAGS based on ARCHFLAGS

Author: jerstlouis

.github/workflows/wheels.yml

@@ -7,12 +7,14 @@ jobs:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         # os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest]
         # os: [ubuntu-latest]
         # os: [windows-2019] #latest]
         # os: [macos-13] # macos-latest]
-        os: [ubuntu-latest, windows-2022, ubuntu-24.04-arm, macos-15-intel, macos-latest]
+        #os: [ubuntu-latest, windows-2022, ubuntu-24.04-arm, macos-15-intel, macos-latest]
+        os: [windows-2022, macos-15-intel, macos-latest]
 
     steps:
       - uses: actions/checkout@v4
@@ -43,15 +45,15 @@ jobs:
         run: git submodule update --init --recursive
 
       - name: Install cibuildwheel
-        run: python3 -m pip install cibuildwheel==2.23.3
+        run: python3 -m pip install cibuildwheel #==2.23.3
 
       - name: Build wheels
         run: python3 -m cibuildwheel --output-dir wheelhouse
         env:
             CIBW_ENABLE: "pypy"
             # Windows PyPy 3.8 build is currently failing due to https://github.com/python-cffi/cffi/issues/170
             # 32-bit builds on Windows are not supported because the MinGW-w64 does not have multilib enabled
-            CIBW_SKIP: "*-win32 pp*-win*"
+            CIBW_SKIP: "*-win32 pp*-win* cp*t-*"
             # This ensures WIN_SHELL_COMMANDS does not get defined on Windows in crossplatform.mk, which breaks deep directory creations
             # since commands are executed in a UNIX-like shell expecting 'mkdir -p'
             CIBW_ENVIRONMENT: "MSYSCON=y"

eC

@@ -134,7 +134,24 @@ def build_package():
          #subprocess.check_call(['gcc', '-v', '-m32'], cwd=eC_dir, env=env)
          #subprocess.check_call(['gcc', '-print-sysroot', '-m32'], cwd=eC_dir, env=env)
          #subprocess.check_call([make_cmd, f'troubleshoot'], cwd=eC_dir, env=env)
-         make_and_args = [make_cmd, f'-j{cpu_count}', 'SKIP_SONAME=y'] #, 'V=1']
+
+         archflags = env.get("ARCHFLAGS", "")
+         # Convert the space-separated -arch into a single-word target flag (work-around for eC compiler not yet recognizing two arguments '-arch arm64')
+         if "arm64" in archflags:
+            archflags = "--target=arm64-apple-macos11.0"
+            env["MACOSX_DEPLOYMENT_TARGET"] = "11.0"
+         elif "x86_64" in archflags:
+            archflags = "--target=x86_64-apple-macos10.9"
+            env["MACOSX_DEPLOYMENT_TARGET"] = "10.9"
+         else:
+            archflags = None
+
+         make_and_args = [make_cmd, f'-j{cpu_count}', 'SKIP_SONAME=y', 'V=1']
+         if archflags is not None:
+            # This will add arm64 architecture flags for macos-latest
+            make_and_args.append('CFLAGS=' + archflags)
+            make_and_args.append('LDFLAGS=' + archflags)
+
          if cc_override is not None:
             make_and_args.extend(cc_override)