From cbe43e2a6c80b906d6ef9e8c574c5e18e120bb8a Mon Sep 17 00:00:00 2001
From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com>
Date: Fri, 8 Sep 2023 10:04:56 -0400
Subject: [PATCH] More tweaks to scripts attempting to get arm64 build using a
 self-hosted runner.

---
 .github/workflows/build_wheels.yml | 7 +++++--
 .gitignore                         | 2 +-
 pyproject.toml                     | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 18b4f4699..5c87756d8 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -9,6 +9,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-11, macos-12, macos-13]
+        arch: [x86_64]
+        include: 
+          - os: self-hosted
+            arch: arm64
     env:
       SYSTEM_VERSION_COMPAT: 0
     steps:
@@ -17,7 +21,7 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.15.0
         env:
-          CIBW_ARCHS_MACOS: universal2
+          CIBW_ARCHS_MACOS: ${{ matrix.arch }}
           CIBW_ARCHS_LINUX: x86_64 aarch64
         with:
           package-dir: .
@@ -28,7 +32,6 @@ jobs:
         with:
           path: ./wheelhouse/*.whl
 
-
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
index ab0e8d718..8135a42d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,4 +57,4 @@ netcdf-c-*
 netcdf-fortran-*
 zlib-*
 
-
+actions-runner*
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 4850d382e..052b2ac32 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -65,14 +65,15 @@ ROOT_DIR="$(pwd)"
 MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion)"
 PREFIX="${ROOT_DIR}"
 HOMEBREW_PREFIX="$(brew --prefix)"
+ARCH="$(uname -m)"
 LD_LIBRARY_PATH="/usr/local/lib:${PREFIX}/lib:${HOMEBREW_PREFIX}/lib"
 LDFLAGS="-Wl,-rpath,${ROOT_DIR}/lib  -Wl,-no_compact_unwind -L${PREFIX}/lib -L${HOMEBREW_PREFIX}/lib" 
 CPATH="/usr/local/include:${PREFIX}/include:${HOMEBREW_PREFIX}/include:${ROOT_DIR}/include"
 CPPFLAGS="-isystem ${PREFIX}/include -isystem /usr/local/include"
 LIBS="-lomp"
-FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch x86_64 -arch arm64"
+FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH}"
 FFFLAGS="${FCFLAGS}"
-CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype -arch x86_64 -arch arm64"
+CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype -arch ${ARCH}"
 CXXFLAGS="${CFLAGS}"
 HDF5_ROOT="${PREFIX}"
 HDF5_LIBDIR="${HDF5_ROOT}/lib"