diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 533f0d76..8b9ff580 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -48,8 +48,6 @@ jobs: - name: Build macos-12 wheels if: matrix.os == 'macos-12' env: - # all cp3xx, since old macs seem to only use osx 12+ builds if this is set not "none" - # see consistency with get_tag() in setup.py MACOSX_DEPLOYMENT_TARGET: 12 CIBW_BUILD: cp311-* CIBW_SKIP: pp* @@ -59,7 +57,7 @@ jobs: - name: Build wheels if: matrix.os == 'macos-14' || matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest' env: - MACOSX_DEPLOYMENT_TARGET: 14 + MACOSX_DEPLOYMENT_TARGET: 11 CIBW_BUILD: cp311-* CIBW_SKIP: pp* *-win32 *-manylinux_i686 *musllinux* CIBW_BUILD_VERBOSITY: 1 diff --git a/fortran/Makefile b/fortran/Makefile index 314332d3..bbf945df 100644 --- a/fortran/Makefile +++ b/fortran/Makefile @@ -102,7 +102,7 @@ SFFLAGS += -static-libgfortran -static-libgcc -static-libquadmath endif else SFFLAGS = -shared -fpic -ifneq ($(CIBW_BUILD),) +ifdef NONNATIVE SFFLAGS += -static-libgfortran -static-libgcc endif endif diff --git a/setup.py b/setup.py index 2595d0f9..20176068 100644 --- a/setup.py +++ b/setup.py @@ -287,5 +287,4 @@ def run(self): package_data={'camb': [DLLNAME, 'HighLExtrapTemplate_lenspotentialCls.dat', 'PArthENoPE_880.2_marcucci.dat', 'PArthENoPE_880.2_standard.dat', 'PRIMAT_Yp_DH_Error.dat', 'PRIMAT_Yp_DH_ErrorMC_2021.dat']}, - test_suite='camb.tests' )