Skip to content

Commit 31438cc

Browse files
committed
Merge #20482: Add depends qt fix for ARM macs
c23f6f8 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 c23f6f8 Tree-SHA512: a8354cec99969cff9e7dab150c335050ddb4b3c93a9f12a4db5e8046f02b11ce692ac17c2b96cbbe7f380c1aa110b15b8d6d48d51bc9c560282c702e99fd8a8d
2 parents eab63b9 + c23f6f8 commit 31438cc

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

depends/packages/qt.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
128128
$(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION)
129129
endif
130130

131+
# for macOS on Apple Silicon (ARM) see https://bugreports.qt.io/browse/QTBUG-85279
132+
$(package)_config_opts_arm_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64
133+
131134
$(package)_config_opts_linux = -qt-xkbcommon-x11
132135
$(package)_config_opts_linux += -qt-xcb
133136
$(package)_config_opts_linux += -no-xcb-xlib

0 commit comments

Comments
 (0)