More improvements to the robustess of the Mac build

MintonGroup · Aug 21, 2023 · f960c30 · f960c30
1 parent 8bd2f9b
commit f960c30
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
+python3 -m build --sdist
+if [ $OS = "MacOSX" ]; then
+    cibuildwheel --platform macos
+elif [ $OS = "Linux" ]; then
+    cibuildwheel --platform linux
+fi
diff --git 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}"
 ]