diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-02-10 07:43:08 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-02-10 07:43:08 +0000 |
| commit | d3298ad74ee5d5dfaa94b50ac4beb0c8f7e577c1 (patch) | |
| tree | 2115f74a96b4f4a502ae235ed1448908100dcb7b /cmake/Modules/HandleLibCXXABI.cmake | |
| parent | e1b6382ee31d987ba0af05c8cf586624745887ca (diff) | |
Revert "Split exception.cpp and new.cpp implementation into different files for different runtimes."
The compiler-rt CMake configuration needs some tweaking before this can land.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294727 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules/HandleLibCXXABI.cmake')
| -rw-r--r-- | cmake/Modules/HandleLibCXXABI.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake index b404e36c1..182565f52 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake @@ -103,11 +103,9 @@ elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") # Assume c++abi is installed in the system, rely on -lc++abi link flag. set(CXXABI_LIBNAME "c++abi") endif() - set(HEADERS "cxxabi.h;__cxxabi_config.h") - if (LIBCXX_CXX_ABI_SYSTEM) - set(HEADERS "") - endif() - setup_abi_lib("-DLIBCXX_BUILDING_LIBCXXABI" ${CXXABI_LIBNAME} "${HEADERS}" "") + setup_abi_lib("-DLIBCXX_BUILDING_LIBCXXABI" + ${CXXABI_LIBNAME} "cxxabi.h;__cxxabi_config.h" "" + ) elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxrt") setup_abi_lib("-DLIBCXXRT" "cxxrt" "cxxabi.h;unwind.h;unwind-arm.h;unwind-itanium.h" "" |