diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-09-21 15:16:21 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-03 09:19:02 +0000 |
commit | c919fc5f65c1c509370df7e616263ed007931a7a (patch) | |
tree | c06c144d4a0b9fb36e9b30115f488580ad907dfb | |
parent | d43c6f1bada49b8c0a90feb96a7b8297f9f1ab05 (diff) |
Pass -arch when running toolchain configure test on Apple platformsv5.12.10
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>
(cherry picked from commit 168438dc3144091fc7df7aa1d4b2f1d8f7a6b51c)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | mkspecs/features/toolchain.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index 03612e5689..5003679bd0 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -182,6 +182,10 @@ isEmpty($${target_prefix}.INCDIRS) { # UIKit simulator platforms will see the device SDK's sysroot in # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass. 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: \ cxx_flags += -isysroot $$sdk_path_device.value else: \ |