summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-08-19 14:23:19 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-08-19 14:23:31 (GMT)
commit5dc9f53f5058e8fd109b30bbdb610f54f4ae3d05 (patch)
tree466006ce46d3dd031c6508cd510fa055691a4a47 /Modules
parent5917b6277fc171fc61d0b277af9bf5950915f863 (diff)
parent164643fc3994f7fca09d4974cb097ec3d418cd53 (diff)
downloadCMake-5dc9f53f5058e8fd109b30bbdb610f54f4ae3d05.zip
CMake-5dc9f53f5058e8fd109b30bbdb610f54f4ae3d05.tar.gz
CMake-5dc9f53f5058e8fd109b30bbdb610f54f4ae3d05.tar.bz2
Merge topic 'android-macos-arm64'
164643fc39 Android: Fix NDK toolchain dir on arm64 mac Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6449
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Android-Determine.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake
index 2d2cd5c..7b67f83 100644
--- a/Modules/Platform/Android-Determine.cmake
+++ b/Modules/Platform/Android-Determine.cmake
@@ -267,7 +267,7 @@ endif()
if(CMAKE_ANDROID_NDK)
# Identify the host platform.
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "64")
set(CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG "darwin-x86_64")
else()
set(CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG "darwin-x86")