commit 1a8295133cd4a18479cb42a0c57b51db60b999e6
author Petr Hosek <phosek@chromium.org> Mon Jan 16 00:33:11 2017 +0000
committer Petr Hosek <phosek@chromium.org> Mon Jan 16 00:33:11 2017 +0000
tree fa4426b0fb06ec8718f8d804f65294401da5343a
parent c8913d52b5d349927ae17fcaaacb8f60e30bfc1a

Reland "[CMake][libcxx] Check that we have libcxxabi before using it"

This relands commit r291726.

llvm-svn: 292086
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 2203aa9a280037136ccca64ac5620a6ceba11f8e

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7d2f4a..8174e75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,8 @@
           ${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)