From a4bd340bf5015169a7dcdff013f018a9338610c1 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 17 Apr 2019 21:57:49 +0000 Subject: [PATCH] [libc++][CMake] Remove unnecessary conditional for defining new handlers It turns out that whether the new handlers should be provided is orthogonal to whether new/delete are provided in libc++ or libc++abi. The reason why I initially added this conditional is because of an incorrect understanding of the path we're taking when building on Apple platforms. In fact, we always build libc++ on top of libc++abi on Apple platforms, so we take the branch for `LIBCXX_BUILDING_LIBCXXABI` there. llvm-svn: 358616 --- libcxx/src/new.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp index 43b234a..901e785 100644 --- a/libcxx/src/new.cpp +++ b/libcxx/src/new.cpp @@ -22,7 +22,7 @@ # include "support/runtime/new_handler_fallback.ipp" #elif defined(__GLIBCXX__) // nothing to do -#elif !defined(_LIBCPP_DISABLE_NEW_DELETE_DEFINITIONS) +#else # include "support/runtime/new_handler_fallback.ipp" #endif -- 2.7.4