diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-02 22:27:45 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-02 22:27:45 +0000 |
| commit | 983f38443b0756e06628b962ed3fdb75c69cf69c (patch) | |
| tree | 4f4f5e862a1f6fbf7c8b7c4ef8782e08487d8ab4 /cmake/Modules/HandleLibCXXABI.cmake | |
| parent | 4b07f988161d67aae5d81b3c4cc98c4844192251 (diff) | |
Revert r290839 - Fix configuring and building libc++ w/o an ABI library
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@290841 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules/HandleLibCXXABI.cmake')
| -rw-r--r-- | cmake/Modules/HandleLibCXXABI.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake index 60f2ca6ac..39f2aa575 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake @@ -102,11 +102,7 @@ elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxrt") setup_abi_lib("-DLIBCXXRT" "cxxrt" "cxxabi.h;unwind.h;unwind-arm.h;unwind-itanium.h" "" ) -elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "none") - list(APPEND LIBCXX_COMPILE_FLAGS "-D_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY") -elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "default") - # Nothing TODO -else() +elseif (NOT "${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "none") message(FATAL_ERROR "Currently libstdc++, libsupc++, libcxxabi, libcxxrt and none are " "supported for c++ abi." |