From eb0081382b16114de189f529ad59c6cd8441287e Mon Sep 17 00:00:00 2001 From: Jo Bates <29763794+jbatez@users.noreply.github.com> Date: Sat, 1 Feb 2025 17:04:46 -0800 Subject: [PATCH 1/2] support MI_OPT_ARCH when targeting multiple CMAKE_OSX_ARCHITECTURES --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c766ce3a..e30c40c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,7 +425,9 @@ endif() if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM_NAME MATCHES "Haiku") if(MI_OPT_ARCH) - if(MI_ARCH STREQUAL "arm64") + if(APPLE AND "arm64" IN_LIST CMAKE_OSX_ARCHITECTURES) + set(MI_OPT_ARCH_FLAGS "-Xarch_arm64" "-march=armv8.1-a") + elseif(MI_ARCH STREQUAL "arm64") set(MI_OPT_ARCH_FLAGS "-march=armv8.1-a") # fast atomics endif() endif() From 0e9159e0bf0943b4c11e3d0746d164033a42f3c8 Mon Sep 17 00:00:00 2001 From: Daan Date: Sat, 8 Feb 2025 12:06:39 -0800 Subject: [PATCH 2/2] add comment --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e30c40c8..530afcf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,7 +425,7 @@ endif() if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM_NAME MATCHES "Haiku") if(MI_OPT_ARCH) - if(APPLE AND "arm64" IN_LIST CMAKE_OSX_ARCHITECTURES) + if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND "arm64" IN_LIST CMAKE_OSX_ARCHITECTURES) # to support multi-arch binaries (#999) set(MI_OPT_ARCH_FLAGS "-Xarch_arm64" "-march=armv8.1-a") elseif(MI_ARCH STREQUAL "arm64") set(MI_OPT_ARCH_FLAGS "-march=armv8.1-a") # fast atomics