diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-01-16 00:33:11 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-01-16 00:33:11 +0000 |
| commit | 6948dbedcaaea1484e1dc2c571fbf2ca193b7277 (patch) | |
| tree | fa4426b0fb06ec8718f8d804f65294401da5343a /CMakeLists.txt | |
| parent | c59c3172dc3aba926fb490d189717b5021b31acc (diff) | |
Reland "[CMake][libcxx] Check that we have libcxxabi before using it"
This relands commit r291726.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292086 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7d2f4aa5..8174e758d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,7 +125,8 @@ if (LIBCXX_CXX_ABI STREQUAL "default") ${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi/include NO_DEFAULT_PATH ) - if (IS_DIRECTORY "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}") + if ((NOT LIBCXX_STANDALONE_BUILD OR HAVE_LIBCXXABI) AND + 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) |