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()