[PATCH] D23289: [libcxxabi] Depend directly on unwind when not building standalone

[Petr Hosek via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL278169: Depend directly on unwind when not building standalone (authored by phosek).

Changed prior to commit:
  https://reviews.llvm.org/D23289?vs=67271&id=67416#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23289

Files:
  libcxxabi/trunk/src/CMakeLists.txt

Index: libcxxabi/trunk/src/CMakeLists.txt
===================================================================
--- libcxxabi/trunk/src/CMakeLists.txt
+++ libcxxabi/trunk/src/CMakeLists.txt
@@ -56,9 +56,14 @@
 
 if (LIBCXXABI_USE_LLVM_UNWINDER)
   if (NOT LIBCXXABI_BUILT_STANDALONE)
-    link_directories(${LLVM_LIBRARY_DIR})
+    if (LIBUNWIND_ENABLE_SHARED)
+      list(APPEND libraries unwind_shared)
+    else()
+      list(APPEND libraries unwind_static)
+    endif()
+  else()
+    list(APPEND libraries unwind)
   endif()
-  list(APPEND libraries unwind)
 else()
   append_if(libraries LIBCXXABI_HAS_GCC_S_LIB gcc_s)
 endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23289.67416.patch
Type: text/x-patch
Size: 632 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160809/3ec23327/attachment.bin>