From f960c3056f770bf8cef29e4ed8f667d2b002eee1 Mon Sep 17 00:00:00 2001
From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com>
Date: Mon, 21 Aug 2023 15:44:36 -0400
Subject: [PATCH] More improvements to the robustess of the Mac build

---
 buildscripts/build_swiftest.sh | 10 ++++++----
 pyproject.toml                 |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/buildscripts/build_swiftest.sh b/buildscripts/build_swiftest.sh
index f8c65c768..c4f06bb4c 100755
--- a/buildscripts/build_swiftest.sh
+++ b/buildscripts/build_swiftest.sh
@@ -30,11 +30,8 @@ SKBUILD_CONFIGURE_OPTIONS="-DBUILD_SHARED_LIBS=OFF"
 
 if [ $OS = "Intel" ]; then 
     FCFLAGS="${CFLAGS} -standard-semantics"
-    FFLAGS=${CFLAGS}
     SKBUILD_CONFIGURE_OPTIONS="${SKBUILD_CONFIGURE_OPTIONS} -DMACHINE_CODE_VALUE=\"SSE2\""
 else
-    FCFLAGS="${CFLAGS}"
-    FFLAGS="${CFLAGS}"
     SKBUILD_CONFIGURE_OPTIONS="${SKBUILD_CONFIGURE_OPTIONS} -DMACHINE_CODE_VALUE=\"generic\""
 fi
 
@@ -63,4 +60,9 @@ fi
 printf "*********************************************************\n"
 
 python3 -m pip install build pip
-python3 -m build
\ No newline at end of file
+python3 -m build --sdist
+if [ $OS = "MacOSX" ]; then
+    cibuildwheel --platform macos
+elif [ $OS = "Linux" ]; then
+    cibuildwheel --platform linux
+fi
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index a68f4f2b6..66e36c0ed 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ before-all = [
 ]
 
 [tool.cibuildwheel.macos]
-environment = {PATH="${TMPDIR}/bin:${PATH}", LD_LIBRARY_PATH="${TMPDIR}/lib:${LD_LIBRARY_PATH}",CPPFLAGS="${CPPFLAGS} -isystem ${TMPDIR}/include",LDFLAGS="${LDFLAGS} -L${TMPDIR}/lib",CPATH="${CPATH} ${TMPDIR}/include}", SKBUILD_CONFIGURE_OPTIONS="-DBUILD_SHARED_LIBS=OFF",FFLAGS="${FFLAGS} -fPIC"}
+skip = "cp38-*"
 before-all = [
     "buildscripts/build_dependencies.sh -d ${TMPDIR} -p ${TMPDIR} -m ${MACOSX_DEPLOYMENT_TARGET}"
 ]