diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-12-07 10:07:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-12-07 10:07:53 +0100 |
| commit | 31438cc8184f9806ef41068c9a7d6ae5ecc0fc7e (patch) | |
| tree | 2364b8cab61b4edc62a388da8c9c9b4b149809c3 /depends/packages | |
| parent | eab63b971d5fc3408214a958678a235bf454af99 (diff) | |
| parent | c23f6f84efa2fe7e7168a5d41341f3a7c5598f70 (diff) | |
Merge #20482: Add depends qt fix for ARM macs
c23f6f84efa2fe7e7168a5d41341f3a7c5598f70 Add depends qt fix for ARM macs (Jonas Schnelli)
Pull request description:
With this, depends builds fine on macOS 11 on an Apple Silicon Mac (ARM64).
ACKs for top commit:
laanwj:
Code review ACK c23f6f84efa2fe7e7168a5d41341f3a7c5598f70
Tree-SHA512: a8354cec99969cff9e7dab150c335050ddb4b3c93a9f12a4db5e8046f02b11ce692ac17c2b96cbbe7f380c1aa110b15b8d6d48d51bc9c560282c702e99fd8a8d
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/qt.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index df0cf5893f..9630df302f 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -128,6 +128,9 @@ $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host) $(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION) endif +# for macOS on Apple Silicon (ARM) see https://bugreports.qt.io/browse/QTBUG-85279 +$(package)_config_opts_arm_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64 + $(package)_config_opts_linux = -qt-xkbcommon-x11 $(package)_config_opts_linux += -qt-xcb $(package)_config_opts_linux += -no-xcb-xlib |