Skip to content

Commit d3949e7

Browse files
authored
Merge pull request #28836 from compnerd/x-windows
build: enable cross-compilation on Windows
2 parents 38e577e + c874aa0 commit d3949e7

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -953,10 +953,15 @@ if(SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT)
953953
set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CMAKE_CXX_COMPILER})
954954
elseif(${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME})
955955
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
956-
set(SWIFT_LIBDISPATCH_C_COMPILER
957-
$<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
958-
set(SWIFT_LIBDISPATCH_CXX_COMPILER
959-
$<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
956+
if(TARGET clang)
957+
set(SWIFT_LIBDISPATCH_C_COMPILER
958+
$<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
959+
set(SWIFT_LIBDISPATCH_CXX_COMPILER
960+
$<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
961+
else()
962+
set(SWIFT_LIBDISPATCH_C_COMPILER clang-cl${CMAKE_EXECUTABLE_SUFFIX})
963+
set(SWIFT_LIBDISPATCH_CXX_COMPILER clang-cl${CMAKE_EXECUTABLE_SUFFIX})
964+
endif()
960965
else()
961966
set(SWIFT_LIBDISPATCH_C_COMPILER $<TARGET_FILE_DIR:clang>/clang)
962967
set(SWIFT_LIBDISPATCH_CXX_COMPILER $<TARGET_FILE_DIR:clang>/clang++)

0 commit comments

Comments
 (0)