Skip to content

Commit 1483bf0

Browse files
3405691582dana
authored and
dana
committed
[cmake] Support OpenBSD amd64 architecture name.
x86_64 is spelled "amd64" on this platform. Return "amd64", for consistency with Swift and other projects. For Windows, return "x86_64".
1 parent b2a1fad commit 1483bf0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

cmake/modules/SwiftSupport.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ function(get_swift_host_arch result_var_name)
2727
set("${result_var_name}" "armv7" PARENT_SCOPE)
2828
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
2929
set("${result_var_name}" "armv7" PARENT_SCOPE)
30-
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
31-
set("${result_var_name}" "x86_64" PARENT_SCOPE)
30+
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "amd64|AMD64")
31+
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
32+
set("${result_var_name}" "x86_64" PARENT_SCOPE)
33+
else()
34+
set("${result_var_name}" "amd64" PARENT_SCOPE)
35+
endif()
3236
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
3337
set("${result_var_name}" "itanium" PARENT_SCOPE)
3438
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")

0 commit comments

Comments
 (0)