From e45fe5b5f6a77b7852204f21a2af7d270bc2f517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 20 Oct 2020 11:13:44 +0300 Subject: [PATCH] build-libcxx: Switch to have libcxxabi provide new/delete operators This matches how it is set by default in current master versions. This requires building a version that includes https://reviews.llvm.org/D89863, otherwise the new/delete operators aren't properly weak. --- build-libcxx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-libcxx.sh b/build-libcxx.sh index e31769f..ba4f1f2 100755 --- a/build-libcxx.sh +++ b/build-libcxx.sh @@ -160,7 +160,7 @@ build_all() { -DLIBCXX_ENABLE_STATIC=$STATIC \ -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \ - -DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=ON \ + -DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=OFF \ -DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=../../libcxxabi/include \ -DLIBCXX_CXX_ABI_LIBRARY_PATH=../../libcxxabi/build-$arch-$type/lib \ @@ -213,7 +213,7 @@ build_all() { -DLIBCXXABI_ENABLE_SHARED=OFF \ -DLIBCXXABI_LIBCXX_INCLUDES=../../libcxx/build-$arch-$type/include/c++/v1 \ -DLIBCXXABI_LIBDIR_SUFFIX="" \ - -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=OFF \ + -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=ON \ -DCXX_SUPPORTS_CXX_STD=TRUE \ -DCMAKE_CXX_FLAGS="$LIBCXXABI_VISIBILITY_FLAGS" \ ..