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

Pass -arch when running toolchain configure test on Apple platforms

Browse Source 
Clang doesn't automatically switch architecture just because we're
passing an iPhoneOS sysroot. In the past this resulted in a warning
about trying to link an x86_64 binary to arm64 libraries, but with
Xcode 12 this is now a hard error.

Fixes: QTBUG-86718
Change-Id: I7e9d2ca513d276029fc2a6cfe694a35fe41c39b3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit ac43986aa5d07685cc61a5dbc00d76abf0cd1017)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2020-09-21 15:16:21 +02:00 committed by Qt Cherry-pick Bot
parent f411be7a4a
commit 168438dc31
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/features/toolchain.prf
View File

@ -182,6 +182,10 @@ isEmpty($${target_prefix}.INCDIRS) {
# UIKit simulator platforms will see the device SDK's sysroot in # UIKit simulator platforms will see the device SDK's sysroot in
# QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass. # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass.
darwin { darwin {
# Clang doesn't pick up the architecture from the sysroot, and will
# default to the host architecture, so we need to manually set it.
cxx_flags += -arch $$QMAKE_APPLE_DEVICE_ARCHS
uikit:macx-xcode: \ uikit:macx-xcode: \
cxx_flags += -isysroot $$sdk_path_device.value cxx_flags += -isysroot $$sdk_path_device.value
else: \ else: \