Skip to content

Commit fb411ba

Browse files
committed
build: treat armv7-a as ARMv7
CMake does not support armv7l as a processor identifier when building for android. Permit the alternative spelling. This is required for standalone standard library only builds.
1 parent f8f7139 commit fb411ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ else()
598598
# FIXME: Only matches v6l/v7l - by far the most common variants
599599
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
600600
set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
601-
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
601+
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv7l|armv7-a")
602602
set(SWIFT_HOST_VARIANT_ARCH_default "armv7")
603603
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
604604
set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")

0 commit comments

Comments
 (0)