1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake/macOS: don't conclude x86_64h is a cross-compilation on x86_64

Browse Source 
Change-Id: I60f6907e58e98e54c000fffd840dcce413b569b6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 081394894bfecd1fb9df1da90b91fbee06150358)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-08-28 16:08:26 -07:00 committed by Qt Cherry-pick Bot
parent 88e7b7e99c
commit eb2a072f91
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtAutoDetectHelpers.cmake
View File

@ -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}. "