diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3926c01..7adeb0f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,7 +156,6 @@ jobs: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BEFORE_ALL_LINUX: yum install -y zip flex bison gcc-gfortran CIBW_BEFORE_ALL_MACOS: brew uninstall --zap gcc - CIBW_BEFORE_BUILD_MACOS: export LDFLAGS="-lc++" CIBW_ENVIRONMENT: ${{ env.CIBW_ENVIRONMENT_COMMON }} CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 CIBW_TEST_EXTRAS_LINUX: applications,test diff --git a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake index 5eea3863..18857ea6 100644 --- a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake +++ b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-dbg.cmake @@ -9,6 +9,7 @@ set(CMAKE_CXX_EXTENSIONS Off) set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") +set(VCPKG_LINKER_FLAGS "${VCPKG_LINKER_FLAGS} -lc++") # Add compiler specific debug flags here too set(VCPKG_CMAKE_SYSTEM_NAME Darwin) diff --git a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake index d176392b..e3702fff 100644 --- a/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake +++ b/vcpkg/overlay-triplets/arm64-osx-dynamic-cxx17-abi1-rel.cmake @@ -9,6 +9,7 @@ set(CMAKE_CXX_EXTENSIONS Off) set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") +set(VCPKG_LINKER_FLAGS "${VCPKG_LINKER_FLAGS} -lc++") set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES arm64)