88function (get_swift_host_arch result_var_name)
99 if ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "x86_64" )
1010 set ("${result_var_name} " "x86_64" PARENT_SCOPE)
11- elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "aarch64" )
12- set ("${result_var_name} " "aarch64" PARENT_SCOPE)
13- elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "arm64" )
14- set ("${result_var_name} " "aarch64" PARENT_SCOPE)
11+ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64" )
12+ if (NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET OR
13+ "${CMAKE_OSX_DEPLOYMENT_TARGET} " STREQUAL "" )
14+ set ("${result_var_name} " "aarch64" PARENT_SCOPE)
15+ else ()
16+ set ("${result_var_name} " "arm64" PARENT_SCOPE)
17+ endif ()
1518 elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "ppc64" )
1619 set ("${result_var_name} " "powerpc64" PARENT_SCOPE)
1720 elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "ppc64le" )
@@ -20,10 +23,10 @@ function(get_swift_host_arch result_var_name)
2023 set ("${result_var_name} " "s390x" PARENT_SCOPE)
2124 elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "armv6l" )
2225 set ("${result_var_name} " "armv6" PARENT_SCOPE)
23- elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "armv7l" )
24- set ("${result_var_name} " "armv7" PARENT_SCOPE)
2526 elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "armv7-a" )
2627 set ("${result_var_name} " "armv7" PARENT_SCOPE)
28+ elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "armv7l" )
29+ set ("${result_var_name} " "armv7" PARENT_SCOPE)
2730 elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "AMD64" )
2831 set ("${result_var_name} " "x86_64" PARENT_SCOPE)
2932 elseif ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "IA64" )
0 commit comments