diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-01-16 00:33:09 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-01-16 00:33:09 +0000 |
| commit | c59c3172dc3aba926fb490d189717b5021b31acc (patch) | |
| tree | bdbe74c03bbff19d34e417faf2724104a1ac5d0f /CMakeLists.txt | |
| parent | 3508e7a87750fe8ff30d44a9154e36509b0ceb8f (diff) | |
Reland "[CMake][libcxx] Do not rely on the existence of c++abi or unwind targets"
This relands commit r291727.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292085 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed66930ea..b7d2f4aa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,8 +125,7 @@ if (LIBCXX_CXX_ABI STREQUAL "default") ${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi/include NO_DEFAULT_PATH ) - if (NOT DEFINED LIBCXX_STANDALONE_BUILD AND - IS_DIRECTORY "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}") + if (IS_DIRECTORY "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}") set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi") set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}") set(LIBCXX_CXX_ABI_INTREE 1) |