Skip to content

Commit 1c90355

Browse files
laanwjgades
authored andcommitted
Merge bitcoin#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
1 parent 2588257 commit 1c90355

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
@@ -97,6 +97,9 @@ $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
9797
$(package)_config_opts_darwin += -device-option MAC_LD64_VERSION=$(LD64_VERSION)
9898
endif
9999

100+
# for macOS on Apple Silicon (ARM) see https://bugreports.qt.io/browse/QTBUG-85279
101+
$(package)_config_opts_arm_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64
102+
100103
$(package)_config_opts_linux = -qt-xkbcommon-x11
101104
$(package)_config_opts_linux += -qt-xcb
102105
$(package)_config_opts_linux += -no-xcb-xlib

0 commit comments

Comments
 (0)