[llvm-branch-commits] [llvm-branch] r370306 - Merging r370271:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug 29 01:58:14 2019
New Revision: 370306

URL: http://llvm.org/viewvc/llvm-project?rev=370306&view=rev
Log:
Merging r370271:
------------------------------------------------------------------------
r370271 | tstellar | 2019-08-29 00:59:04 +0200 (Thu, 29 Aug 2019) | 6 lines

[LLVM-C] Fix omission of INSTALL_WITH_TOOLCHAIN to llvm_add_library()

Due to a misstake with r365902 that tried to simplify the install with
toolchain logic LLVM-C.dll was no longer being installed.

Patch By: Jakob Bornecrantz
------------------------------------------------------------------------

Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/tools/llvm-shlib/CMakeLists.txt

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 29 01:58:14 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366447,366481,366487,366527,366570,366660,366868,366925,367019,367030,367062,367084,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367412,367417,367429,367580,367662,367750,367753,367846-367847,367898,367941,368004,368230,368300,368315,368324,368477-368478,368517-368519,368554,368572,368873,369011,369026,369084,369095,369097,369168,369199,369426,369443,369886,370036,370176,370204
+/llvm/trunk:155241,366431,366447,366481,366487,366527,366570,366660,366868,366925,367019,367030,367062,367084,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367412,367417,367429,367580,367662,367750,367753,367846-367847,367898,367941,368004,368230,368300,368315,368324,368477-368478,368517-368519,368554,368572,368873,369011,369026,369084,369095,369097,369168,369199,369426,369443,369886,370036,370176,370204,370271

Modified: llvm/branches/release_90/tools/llvm-shlib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/tools/llvm-shlib/CMakeLists.txt?rev=370306&r1=370305&r2=370306&view=diff
==============================================================================
--- llvm/branches/release_90/tools/llvm-shlib/CMakeLists.txt (original)
+++ llvm/branches/release_90/tools/llvm-shlib/CMakeLists.txt Thu Aug 29 01:58:14 2019
@@ -182,6 +182,6 @@ if(MSVC)
     VERBATIM )
 
   # Finally link the target.
-  add_llvm_library(LLVM-C SHARED ${SOURCES} DEPENDS intrinsics_gen)
+  add_llvm_library(LLVM-C SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS intrinsics_gen)
 
 endif()