diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-01-11 23:56:29 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-01-11 23:56:29 +0000 |
| commit | 010074a5961833f18e81881f2627aa4a0e1f37e4 (patch) | |
| tree | 6463f4a221a8d7be06958b4290bdf589090d0862 /CMakeLists.txt | |
| parent | 8c91834411b322ab360eb1f193f489327e719652 (diff) | |
Revert "[CMake][libcxx] Check that we have libcxxabi before using it"
This reverts commit 8c91834411b322ab360eb1f193f489327e719652.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291726 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 918b41258..fb7b9457f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,8 +119,7 @@ if (LIBCXX_CXX_ABI STREQUAL "default") ${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi/include NO_DEFAULT_PATH ) - if ((NOT LIBCXX_STANDALONE_BUILD OR HAVE_LIBCXXABI) 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) |