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 | 2203aa9a280037136ccca64ac5620a6ceba11f8e (patch) | |
| tree | 7b5876d8b0f5e950f5a7ecd155ab202fdb4713c8 | |
| parent | 06d3c51c88b1fb9432a35ef0384dafb7b1d152a8 (diff) | |
| download | bcm5719-llvm-2203aa9a280037136ccca64ac5620a6ceba11f8e.tar.gz bcm5719-llvm-2203aa9a280037136ccca64ac5620a6ceba11f8e.zip | |
Reland "[CMake][libcxx] Check that we have libcxxabi before using it"
This relands commit r291726.
llvm-svn: 292086
| -rw-r--r-- | libcxx/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index b7d2f4aa56d..8174e758d88 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/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) |
