Skip to content

Commit 6c384e0

Browse files
committed
build: honour SWIFT_CLANG_LOCATION
We would previously use `clang-cl` without the explicit path which could find an alternative `clang-cl` instance. This manifested as a failure to build libdispatch as part of the compiler when cross-compiling x64 to arm64.
1 parent c2f7452 commit 6c384e0

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

cmake/modules/Libdispatch.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
1414
$<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
1515
set(SWIFT_LIBDISPATCH_CXX_COMPILER
1616
$<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
17+
elseif(DEFINED SWIFT_CLANG_LOCATION)
18+
set(SWIFT_LIBDISPATCH_C_COMPILER ${SWIFT_CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
19+
set(SWIFT_LIBDISPATCH_CXX_COMPILER ${SWIFT_CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
1720
else()
1821
set(SWIFT_LIBDISPATCH_C_COMPILER clang-cl${CMAKE_EXECUTABLE_SUFFIX})
1922
set(SWIFT_LIBDISPATCH_CXX_COMPILER clang-cl${CMAKE_EXECUTABLE_SUFFIX})

0 commit comments

Comments
 (0)