Author: phosek Date: Tue Aug 9 16:28:52 2016 New Revision: 278169 URL: http://llvm.org/viewvc/llvm-project?rev=278169&view=rev Log: Depend directly on unwind when not building standalone
When using libunwind and not building as standalone project, we can directly depend on the unwind library target. Differential Revision: https://reviews.llvm.org/D23289 Modified: libcxxabi/trunk/src/CMakeLists.txt Modified: libcxxabi/trunk/src/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/CMakeLists.txt?rev=278169&r1=278168&r2=278169&view=diff ============================================================================== --- libcxxabi/trunk/src/CMakeLists.txt (original) +++ libcxxabi/trunk/src/CMakeLists.txt Tue Aug 9 16:28:52 2016 @@ -56,9 +56,14 @@ append_if(libraries LIBCXXABI_HAS_C_LIB 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() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
