diff options
| author | Francis Ricci <francisjricci@gmail.com> | 2016-08-16 13:58:56 +0000 |
|---|---|---|
| committer | Francis Ricci <francisjricci@gmail.com> | 2016-08-16 13:58:56 +0000 |
| commit | 0b5730da7f2a52b75ec322e4138f42fb2f05db82 (patch) | |
| tree | 7105d5f8dd2a4a79f362a889ef593706e790e95f /CMakeLists.txt | |
| parent | c76504f151c2539b0af9fc70cf11577a2e025a47 (diff) | |
Revert "[compiler-rt] Allow c++ abi to be explictly disabled in cmake configuration"
This reverts commit cd5fa595648378f38cdad8b07e18433639c28a9c.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@278800 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a12151925..f72fb01fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,19 +85,6 @@ option(COMPILER_RT_EXTERNALIZE_DEBUGINFO # COMPILER_RT_DEBUG_PYBOOL is used by lit.common.configured.in. pythonize_bool(COMPILER_RT_DEBUG) -if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9") - # Mac OS X prior to 10.9 had problems with exporting symbols from - # libc++/libc++abi. - set(use_cxxabi_default OFF) -elseif(MSVC) - set(use_cxxabi_default OFF) -else() - set(use_cxxabi_default ON) -endif() - -option(SANITIZER_CAN_USE_CXXABI "Sanitizers can use cxxabi" ${use_cxxabi_default}) -pythonize_bool(SANITIZER_CAN_USE_CXXABI) - #================================ # Setup Compiler Flags #================================ @@ -217,6 +204,17 @@ append_list_if(COMPILER_RT_HAS_WD4800_FLAG /wd4800 SANITIZER_COMMON_CFLAGS) # Warnings to turn off for all libraries, not just sanitizers. append_string_if(COMPILER_RT_HAS_WUNUSED_PARAMETER_FLAG -Wno-unused-parameter CMAKE_C_FLAGS CMAKE_CXX_FLAGS) +if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9") + # Mac OS X prior to 10.9 had problems with exporting symbols from + # libc++/libc++abi. + set(SANITIZER_CAN_USE_CXXABI FALSE) +elseif(MSVC) + set(SANITIZER_CAN_USE_CXXABI FALSE) +else() + set(SANITIZER_CAN_USE_CXXABI TRUE) +endif() +pythonize_bool(SANITIZER_CAN_USE_CXXABI) + add_subdirectory(include) set(COMPILER_RT_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/projects/libcxx) |