Skip to content

Commit 8adb644

Browse files
authored
Merge pull request swiftlang#812 from hjyamauchi/arm64
Support Windows ARM64 builds
2 parents bb1cb6a + 1167094 commit 8adb644

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmake/modules/DispatchWindowsSupport.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function(dispatch_windows_arch_spelling arch var)
66
set(${var} x64 PARENT_SCOPE)
77
elseif(${arch} STREQUAL armv7)
88
set(${var} arm PARENT_SCOPE)
9-
elseif(${arch} STREQUAL aarch64)
9+
elseif(${arch} STREQUAL aarch64 OR ${arch} STREQUAL ARM64)
1010
set(${var} arm64 PARENT_SCOPE)
1111
else()
1212
message(FATAL_ERROR "do not know MSVC spelling for ARCH: `${arch}`")

cmake/modules/SwiftSupport.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
function(get_swift_host_arch result_var_name)
1010
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
1111
set("${result_var_name}" "x86_64" PARENT_SCOPE)
12-
elseif ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AArch64|aarch64|arm64")
12+
elseif ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AArch64|aarch64|arm64|ARM64")
1313
if(CMAKE_SYSTEM_NAME MATCHES Darwin)
1414
set("${result_var_name}" "arm64" PARENT_SCOPE)
1515
else()

0 commit comments

Comments
 (0)