Skip to content

Commit c9c5cbd

Browse files
committed
build: support multiple architectures on Windows
Swift on Windows only supports 64-bit hosts. Add support for x64 and ARM64 toolchains to be built.
1 parent 90601d8 commit c9c5cbd

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

lldb/cmake/modules/AddLLDB.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,13 @@ function(add_properties_for_swift_modules target reldir)
229229
set_property(TARGET ${target} APPEND PROPERTY BUILD_RPATH "${SWIFT_BUILD_RPATH}")
230230
set_property(TARGET ${target} APPEND PROPERTY INSTALL_RPATH "${SWIFT_INSTALL_RPATH}")
231231
elseif(CMAKE_SYSTEM_NAME MATCHES Windows)
232-
target_link_directories(${target} PRIVATE
233-
${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/Windows/x86_64)
232+
if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64|amd64|x86_64)
233+
target_link_directories(${target} PRIVATE
234+
${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/windows/x86_64)
235+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ARM64|arm64|aarch64)
236+
target_link_directories(${target} PRIVATE
237+
${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/windows/aarch64)
238+
endif()
234239
endif()
235240

236241
if (SWIFT_SWIFT_PARSER)

0 commit comments

Comments
 (0)