[PATCH] D62032: build: use clang-cl for runtimes when targeting Windows

[Saleem Abdulrasool via Phabricator via llvm-commits]

compnerd created this revision.
compnerd added reviewers: beanz, smeenai.
Herald added a subscriber: mgorny.
Herald added a project: LLVM.

Adjust the CMAKE_C{,XX}_COMPILER passed to the subproject build for the runtimes when targeting Windows.


Repository:
  rL LLVM

https://reviews.llvm.org/D62032

Files:
  cmake/modules/LLVMExternalProjectUtils.cmake


Index: cmake/modules/LLVMExternalProjectUtils.cmake
===================================================================
--- cmake/modules/LLVMExternalProjectUtils.cmake
+++ cmake/modules/LLVMExternalProjectUtils.cmake
@@ -106,8 +106,13 @@

   if(ARG_USE_TOOLCHAIN AND NOT CMAKE_CROSSCOMPILING)
     if(CLANG_IN_TOOLCHAIN)
-      set(compiler_args -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang
-                        -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++)
+      if(${${nameCanon}_CMAKE_SYSTEM_NAME} STREQUAL Windows)
+        set(compiler_args -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang-cl
+                          -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang-cl)
+      else()
+        set(compiler_args -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang
+                          -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++)
+      endif()
     endif()
     if(lld IN_LIST TOOLCHAIN_TOOLS)
       list(APPEND compiler_args -DCMAKE_LINKER=${LLVM_RUNTIME_OUTPUT_INTDIR}/ld.lld)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D62032.199899.patch
Type: text/x-patch
Size: 1056 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190516/c318d29c/attachment.bin>