diff options
| author | Derek Schuff <dschuff@google.com> | 2016-09-16 18:50:39 +0000 |
|---|---|---|
| committer | Derek Schuff <dschuff@google.com> | 2016-09-16 18:50:39 +0000 |
| commit | eb2246365b7a84b1f829ce2c65cef423ea0a01d8 (patch) | |
| tree | d08f521269846c2d429075b4e96a7dff24845349 | |
| parent | 2364748a49ec7d4dbec42bfa669f31305007e9e9 (diff) | |
| download | bcm5719-llvm-eb2246365b7a84b1f829ce2c65cef423ea0a01d8.tar.gz bcm5719-llvm-eb2246365b7a84b1f829ce2c65cef423ea0a01d8.zip | |
Install libLLVM if needed with LLVM_INSTALL_TOOLCHAIN_ONLY
Summary:
When LLVM_LINK_LLVM_DYLIB is set, the libLLVM shared
library needs to be installed in the toolchain. Without
this chanage LLVM_INSTALL_TOOLCHAIN_ONLY combined with
LLVM_LINK_LLVM_DYLIB results in a broken install.
Patch by Sam Clegg
Differential Revision: https://reviews.llvm.org/D24676
llvm-svn: 281763
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 05b51d96d76..46c9d33de37 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -555,7 +555,8 @@ macro(add_llvm_library name) elseif(ARG_BUILDTREE_ONLY) set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS_BUILDTREE_ONLY ${name}) else() - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO") + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR + (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) set(install_dir lib${LLVM_LIBDIR_SUFFIX}) if(ARG_SHARED OR BUILD_SHARED_LIBS) if(WIN32 OR CYGWIN OR MINGW) |
