Skip to content

Commit fcfd37f

Browse files
committed
Merge bitcoin/bitcoin#22123: depends: Fix qt.mk for mac arm64
3b36395 depends: Fix qt.mk for mac arm64 (João Barbosa) Pull request description: With f16d4cd `depends/config.guess` gives `aarch64-apple-darwin20.3.0` where before would give `arm-apple-darwin20.3.0`. Fix `qt.mk` accordingly. ACKs for top commit: hebasto: ACK 3b36395, I have reviewed the code and it looks OK, I agree it can be merged. fanquake: ACK 3b36395 Tree-SHA512: bd20402d0a6e9a5bb652198de189cf2b4f3f76fd03d0cba8c4d657c60b8a088cf3532efe6c1efbbedd94c00a155e6d180b77f1cd8bc24e0e35764839e8b77e30
2 parents 6fe012c + 3b36395 commit fcfd37f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

depends/packages/qt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ $(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION)
126126
endif
127127

128128
# for macOS on Apple Silicon (ARM) see https://bugreports.qt.io/browse/QTBUG-85279
129-
$(package)_config_opts_arm_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64
129+
$(package)_config_opts_aarch64_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64
130130

131131
$(package)_config_opts_linux = -qt-xcb
132132
$(package)_config_opts_linux += -no-xcb-xlib

0 commit comments

Comments
 (0)