diff --git a/buildscripts/set_compilers.sh b/buildscripts/set_compilers.sh index a9da4a50f..4e2fafa8f 100755 --- a/buildscripts/set_compilers.sh +++ b/buildscripts/set_compilers.sh @@ -89,16 +89,16 @@ case $COMPILER in CPP=${CPP:-$(command -v cpp)} ;; GNU-Mac) - MAJOR=$(echo ${MACOSX_DEPLOYMENT_TARGET} | awk '{print $1}' FS=.) - printf "MACOS Major Version: ${MAJOR}\n" - FC=${FC:-$HOMEBREW_PREFIX/bin/gfortran-${MAJOR}} - CC=${CC:-$HOMEBREW_PREFIX/bin/gcc-${MAJOR}} - CXX=${CXX:-$HOMEBREW_PREFIX/bin/g++-${MAJOR}} - CPP=${CPP:-$HOMEBREW_PREFIX/bin/cpp-${MAJOR}} - AR=${AR:-$HOMEBREW_PREFIX/bin/gcc-ar-${MAJOR}} - NM=${NM:-$HOMEBREW_PREFIX/bin/gcc-nm-${MAJOR}} - RANLIB=${RANLIB:-$HOMEBREW_PREFIX/bin/gcc-ranlib-${MAJOR}} - LD_LIBRARY_PATH="${HOMEBREW_PREFIX}/lib/gcc/${MAJOR}/lib:${LD_LIBRARY_PATH}" + GCCVER=${GCCVER:-13} + printf "GCC Version: ${GCCVER}\n" + FC=${FC:-$HOMEBREW_PREFIX/bin/gfortran-${GCCVER}} + CC=${CC:-$HOMEBREW_PREFIX/bin/gcc-${GCCVER}} + CXX=${CXX:-$HOMEBREW_PREFIX/bin/g++-${GCCVER}} + CPP=${CPP:-$HOMEBREW_PREFIX/bin/cpp-${GCCVER}} + AR=${AR:-$HOMEBREW_PREFIX/bin/gcc-ar-${GCCVER}} + NM=${NM:-$HOMEBREW_PREFIX/bin/gcc-nm-${GCCVER}} + RANLIB=${RANLIB:-$HOMEBREW_PREFIX/bin/gcc-ranlib-${GCCVER}} + LD_LIBRARY_PATH="${HOMEBREW_PREFIX}/lib/gcc/${GCCVER}/lib:${LD_LIBRARY_PATH}" ;; *) printf "Unknown compiler type: ${COMPILER}\n" diff --git a/pyproject.toml b/pyproject.toml index b473bb6e3..5bb894d1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ before-all = [ [tool.cibuildwheel.macos] archs = ["x86_64", "universal2", "arm64"] -environment = {PATH="${TMPDIR}/bin:${PATH}",MACOSX_DEPLOYMENT_TARGET="11.0", LD_LIBRARY_PATH="${TMPDIR}/lib:${LD_LIBRARY_PATH}",CPPFLAGS="${CPPFLAGS} -isystem ${TMPDIR}/include",LDFLAGS="${LDFLAGS} -L${TMPDIR}/lib -fPIE -Wl,-no_compact_unwind",CPATH="${CPATH} ${TMPDIR}/include}", CFLAGS="${CFLAGS} -Wno-unused-but-set-variable -fPIC -Wno-deprecated-non-prototype", SKBUILD_CONFIGURE_OPTIONS="-DUSE_OPENMP=OFF -DUSE_SIMD=OFF -DBUILD_SHARED_LIBS=OFF",FFLAGS="${FFLAGS} -fPIC"} +environment = {GCCVER="13",PATH="${TMPDIR}/bin:${PATH}",MACOSX_DEPLOYMENT_TARGET="11.0", LD_LIBRARY_PATH="${TMPDIR}/lib:${LD_LIBRARY_PATH}",CPPFLAGS="${CPPFLAGS} -isystem ${TMPDIR}/include",LDFLAGS="${LDFLAGS} -L${TMPDIR}/lib -fPIE -Wl,-no_compact_unwind",CPATH="${CPATH} ${TMPDIR}/include}", CFLAGS="${CFLAGS} -Wno-unused-but-set-variable -fPIC -Wno-deprecated-non-prototype", SKBUILD_CONFIGURE_OPTIONS="-DUSE_OPENMP=OFF -DUSE_SIMD=OFF -DBUILD_SHARED_LIBS=OFF",FFLAGS="${FFLAGS} -fPIC"} before-all = [ "buildscripts/build_dependencies.sh -d ${TMPDIR} -p ${TMPDIR} -m ${MACOSX_DEPLOYMENT_TARGET}" ]