diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-03 21:04:16 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-03 21:04:41 +0800 |
| commit | fcfd37f3f9dc54b583f111f90d2ced4b35cbee20 (patch) | |
| tree | 74eb5f10a4d56b7f9a5a39f4e2de1e99a476badb | |
| parent | 6fe012c6bd6a7977281df0b9292dc9c684915aba (diff) | |
| parent | 3b36395b96c533dde47256b505cf1cbb2844c96e (diff) | |
Merge bitcoin/bitcoin#22123: depends: Fix qt.mk for mac arm64
3b36395b96c533dde47256b505cf1cbb2844c96e depends: Fix qt.mk for mac arm64 (João Barbosa)
Pull request description:
With f16d4cd8c5412890ee0b73f4ef142b59d130e5d5 `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 3b36395b96c533dde47256b505cf1cbb2844c96e, I have reviewed the code and it looks OK, I agree it can be merged.
fanquake:
ACK 3b36395b96c533dde47256b505cf1cbb2844c96e
Tree-SHA512: bd20402d0a6e9a5bb652198de189cf2b4f3f76fd03d0cba8c4d657c60b8a088cf3532efe6c1efbbedd94c00a155e6d180b77f1cd8bc24e0e35764839e8b77e30
| -rw-r--r-- | depends/packages/qt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 5f9958e0ed..7709f3aabd 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -126,7 +126,7 @@ $(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_aarch64_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64 $(package)_config_opts_linux = -qt-xcb $(package)_config_opts_linux += -no-xcb-xlib |