From 16c865ef9805b886ebae97964d45b3b52598aab7 Mon Sep 17 00:00:00 2001 From: simon987 Date: Tue, 16 Nov 2021 19:50:43 -0500 Subject: [PATCH] Fix cpu detection in meson configuration script (#21382) --- scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index e0eab20987..4c5d7be641 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -241,7 +241,7 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu # Show real machine architecture to visually understand whether we are in a native Apple Silicon terminal or running under Rosetta emulation debug_message("Machine: ${MACHINE}") - if(MACHINE MATCHES "arm64") + if(MACHINE MATCHES "arm64|aarch64") set(build_cpu_fam aarch64) set(build_cpu armv8) elseif(MACHINE MATCHES "x86_64|amd64")