diff options
| author | Petr Hosek <phosek@chromium.org> | 2016-08-09 21:28:52 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2016-08-09 21:28:52 +0000 |
| commit | 8ec04577d6e559b80dc2c7ec1ed11568dbdcddd8 (patch) | |
| tree | 067e89c84dfabe0cbcef1c6f9ae2652247e72bc6 /libcxxabi | |
| parent | 5ed648e50987853e1590d42dc56a268fad58df19 (diff) | |
| download | bcm5719-llvm-8ec04577d6e559b80dc2c7ec1ed11568dbdcddd8.tar.gz bcm5719-llvm-8ec04577d6e559b80dc2c7ec1ed11568dbdcddd8.zip | |
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
llvm-svn: 278169
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index 163e8ceb75c..3af703c5873 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -56,9 +56,14 @@ append_if(libraries LIBCXXABI_HAS_C_LIB c) 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() |
