[PATCH] D29146: Link LLVM dynamically on Windows, deploy Universal CRT dlls.

[Vadim Chugunov via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL293373: This addresses LLDB bug 31699, which was caused by LLVM using static linking on… (authored by vadimcn).

Changed prior to commit:
  https://reviews.llvm.org/D29146?vs=85788&id=86167#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D29146

Files:
  llvm/trunk/CMakeLists.txt
  llvm/trunk/utils/release/build_llvm_package.bat


Index: llvm/trunk/CMakeLists.txt
===================================================================
--- llvm/trunk/CMakeLists.txt
+++ llvm/trunk/CMakeLists.txt
@@ -978,3 +978,8 @@
     endif()
   endforeach()
 endif()
+
+# This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake
+if (MSVC)
+  include(InstallRequiredSystemLibraries)
+endif()
Index: llvm/trunk/utils/release/build_llvm_package.bat
===================================================================
--- llvm/trunk/utils/release/build_llvm_package.bat
+++ llvm/trunk/utils/release/build_llvm_package.bat
@@ -51,7 +51,7 @@
 
 
 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
-set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DLLVM_USE_CRT_RELEASE=MT -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "
+set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCMAKE_INSTALL_UCRT_LIBRARIES=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "
 
 REM TODO: Run all tests, including lld and compiler-rt.
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29146.86167.patch
Type: text/x-patch
Size: 1497 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170128/5bc80211/attachment.bin>