]> granicus.if.org Git - llvm/commitdiff
Install libLLVM if needed with LLVM_INSTALL_TOOLCHAIN_ONLY
authorDerek Schuff <dschuff@google.com>
Fri, 16 Sep 2016 18:50:39 +0000 (18:50 +0000)
committerDerek Schuff <dschuff@google.com>
Fri, 16 Sep 2016 18:50:39 +0000 (18:50 +0000)
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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@281763 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/AddLLVM.cmake

index 05b51d96d76fa4818e0f200855f214eae5f7ed49..46c9d33de37a3ac0561c8a4373dcf8bf49c1a0c9 100644 (file)
@@ -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)