diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-17 21:57:49 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-17 21:57:49 +0000 |
| commit | a4bd340bf5015169a7dcdff013f018a9338610c1 (patch) | |
| tree | 193f7499bfcb0f6f72e5411b46ade792f9d7bc7f /libcxx/src | |
| parent | e3b5eba1bad14be1abd1b4dbba12996e2726fdf0 (diff) | |
| download | bcm5719-llvm-a4bd340bf5015169a7dcdff013f018a9338610c1.tar.gz bcm5719-llvm-a4bd340bf5015169a7dcdff013f018a9338610c1.zip | |
[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
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/new.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp index 43b234ac488..901e7856585 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 |
