llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Petr Hosek (petrhosek) <details> <summary>Changes</summary> Configure Windows runtimes with CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded to match the rest of the toolchain build. --- Full diff: https://github.com/llvm/llvm-project/pull/238240.diff 2 Files Affected: - (modified) clang/cmake/caches/Fuchsia-stage2.cmake (+1) - (modified) clang/cmake/caches/Fuchsia.cmake (+1-1) ``````````diff diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index 9d549fe94f43c2..f8864dc2609d3f 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -127,6 +127,7 @@ if(WIN32 OR LLVM_WINSYSROOT) list(APPEND RUNTIME_TARGETS "${target}") set(RUNTIMES_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "") set(RUNTIMES_${target}_CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "") + set(RUNTIMES_${target}_CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded CACHE STRING "") set(RUNTIMES_${target}_LIBCXX_ABI_UNSTABLE ON CACHE STRING "") set(RUNTIMES_${target}_LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "") set(RUNTIMES_${target}_LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index 87b8a9f109d3ea..4402de75443f89 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -117,7 +117,7 @@ if(WIN32) set(LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "") set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") set(BUILTINS_CMAKE_ARGS -DCMAKE_SYSTEM_NAME=Windows CACHE STRING "") - set(RUNTIMES_CMAKE_ARGS -DCMAKE_SYSTEM_NAME=Windows CACHE STRING "") + set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Windows;-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded" CACHE STRING "") set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "") else() set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "") `````````` </details> https://github.com/llvm/llvm-project/pull/238240 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
