From 081394894bfecd1fb9df1da90b91fbee06150358 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 28 Aug 2024 16:08:26 -0700
Subject: [PATCH] CMake/macOS: don't conclude x86_64h is a cross-compilation on
 x86_64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pick-to: 6.8
Change-Id: I60f6907e58e98e54c000fffd840dcce413b569b6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtAutoDetectHelpers.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/QtAutoDetectHelpers.cmake b/cmake/QtAutoDetectHelpers.cmake
index aa7471f4cb3..167c0c89e18 100644
--- a/cmake/QtAutoDetectHelpers.cmake
+++ b/cmake/QtAutoDetectHelpers.cmake
@@ -445,7 +445,8 @@ function(qt_auto_detect_macos_single_arch_cross_compilation)
     endif()
 
     qt_internal_get_early_apple_host_system_arch(host_arch)
-    if(NOT "${host_arch}" STREQUAL "${target_arch}")
+    if(NOT "${host_arch}" STREQUAL "${target_arch}" AND
+            NOT ("${host_arch}" STREQUAL "x86_64" AND "${target_arch}" STREQUAL "x86_64h"))
         message(
             STATUS "Detected implicit macOS cross-compilation. "
             "Host arch: ${host_arch} Target arch: ${target_arch}. "