From d6e40e503bedf5eff54fa32d7a8b46634106aae6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 31 Jul 2024 14:01:37 +1100 Subject: [PATCH] explicitly build against system-libcxxabi --- recipe/build.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 8eae5ec..1ac6a90 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -9,6 +9,8 @@ if [[ "$target_platform" == osx-* ]]; then export CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_OSX_SYSROOT=$CONDA_BUILD_SYSROOT" export CMAKE_ARGS="$CMAKE_ARGS -DLIBCXX_ENABLE_VENDOR_AVAILABILITY_ANNOTATIONS=ON" + # we want to build against the system libcxxabi, not ship our own + export CMAKE_ARGS="$CMAKE_ARGS -DLIBCXX_CXX_ABI=system-libcxxabi" fi export CFLAGS="$CFLAGS -I$LLVM_PREFIX/include -I$BUILD_PREFIX/include" @@ -37,8 +39,3 @@ ninja -C build cxx cxxabi unwind # Install ninja -C build install-cxx install-cxxabi install-unwind - -if [[ "$target_platform" == osx-* ]]; then - # on osx we point libc++ to the system libc++abi - $INSTALL_NAME_TOOL -change "@rpath/libc++abi.1.dylib" "/usr/lib/libc++abi.dylib" $PREFIX/lib/libc++.1.0.dylib -fi