[PATCH] D29575: [libcxx][CMake] Support in-tree libunwind when building as part of runtimes

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
Herald added a subscriber: mgorny.

When building as part of runtimes, there is no predefined order in which the runtimes are loaded, so the targets from other projects might not be available. We need to rely on HAVE_<name> variables instead in that case.


Repository:
  rL LLVM

https://reviews.llvm.org/D29575

Files:
  lib/CMakeLists.txt


Index: lib/CMakeLists.txt
===================================================================
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -89,9 +89,9 @@
 
 # Add the unwinder library.
 if (LIBCXXABI_USE_LLVM_UNWINDER)
-  if (TARGET unwind_shared)
+  if (TARGET unwind_shared OR HAVE_LIBUNWIND)
     add_interface_library(unwind_shared)
-  elseif (TARGET unwind_static)
+  elseif (TARGET unwind_static OR HAVE_LIBUNWIND)
     add_interface_library(unwind_static)
   else()
     add_interface_library(unwind)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29575.87187.patch
Type: text/x-patch
Size: 512 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170206/16c1b27c/attachment.bin>