diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-09 09:35:38 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-09 09:35:38 +0000 |
| commit | f57a2d5bf8dbb591474b18330ccb156b1069d53d (patch) | |
| tree | 7ee3b14c4d95a709a95c419eb06dfc72f4dd1304 | |
| parent | 8389196dd978f7d1fa206d88e4a82e35f4c3d1f3 (diff) | |
| download | bcm5719-llvm-f57a2d5bf8dbb591474b18330ccb156b1069d53d.tar.gz bcm5719-llvm-f57a2d5bf8dbb591474b18330ccb156b1069d53d.zip | |
Merging r339319:
------------------------------------------------------------------------
r339319 | hans | 2018-08-09 10:41:03 +0200 (Thu, 09 Aug 2018) | 1 line
cmake: don't pack system libs unless CMAKE_INSTALL_UCRT_LIBRARIES is set (PR38476)
------------------------------------------------------------------------
llvm-svn: 339323
| -rw-r--r-- | llvm/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 32134e25019..31df64089eb 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -1037,6 +1037,6 @@ if(LLVM_DISTRIBUTION_COMPONENTS) endif() # This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake -if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") +if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_INSTALL_UCRT_LIBRARIES) include(InstallRequiredSystemLibraries) endif() |
