diff options
author | Petr Hosek <phosek@chromium.org> | 2017-07-26 06:46:10 +0000 |
---|---|---|
committer | Petr Hosek <phosek@chromium.org> | 2017-07-26 06:46:10 +0000 |
commit | 8e31fff29bcbd5148e222e11130671bfe46de849 (patch) | |
tree | 9c3600f45b806aafae26485cc388c30e30cec72e /CMakeLists.txt | |
parent | d1997bff31cf6b484eb59c2ee1fc3155442e338c (diff) |
Revert "[sanitizer] Support libc++abi in addition to libstdc++"
This reverts commit d1997bff31cf6b484eb59c2ee1fc3155442e338c.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@309082 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b4817457..d2d829ae0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,40 +94,6 @@ endif() option(SANITIZER_CAN_USE_CXXABI "Sanitizers can use cxxabi" ${use_cxxabi_default}) pythonize_bool(SANITIZER_CAN_USE_CXXABI) -set(SANITIZER_CXX_ABI "default" CACHE STRING - "Specify C++ ABI library to use.") -set(CXXABIS none default libcxxabi libstdc++) -set_property(CACHE SANITIZER_CXX_ABI PROPERTY STRINGS ;${CXXABIS}) - -if (SANITIZER_CXX_ABI STREQUAL "default") - if (HAVE_LIBCXXABI AND COMPILER_RT_DEFAULT_TARGET_ONLY) - set(SANITIZER_CXX_ABI_LIBNAME "libcxxabi") - set(SANITIZER_CXX_ABI_INTREE 1) - elseif (APPLE) - set(SANITIZER_CXX_ABI_LIBNAME "libcxxabi") - set(SANITIZER_CXX_ABI_SYSTEM 1) - else() - set(SANITIZER_CXX_ABI_LIBNAME "libstdc++") - endif() -elseif() - set(SANITIZER_CXX_ABI_LIBNAME "${SANITIZER_CXX_ABI}") -endif() - -if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libcxxabi") - if (SANITIZER_CXX_ABI_INTREE) - if (TARGET unwind_shared OR HAVE_LIBUNWIND) - list(APPEND SANITIZER_CXX_ABI_LIBRARY unwind_shared) - endif() - if (TARGET cxxabi_shared OR HAVE_LIBCXXABI) - list(APPEND SANITIZER_CXX_ABI_LIBRARY cxxabi_shared) - endif() - else() - list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++abi") - endif() -elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libstdc++") - append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_CXX_ABI_LIBRARY) -endif() - option(SANITIZER_USE_COMPILER_RT "Use compiler-rt builtins instead of libgcc" OFF) #================================ |