With f16d4cd8c5412890ee0b73f4ef142b59d130e5d5 depends/config.guess gives aarch64-apple-darwin20.3.0 where before would give arm-apple-darwin20.3.0. Fix qt.mk accordingly.
depends: Fix qt.mk for mac arm64 #22123
pull promag wants to merge 1 commits into bitcoin:master from promag:2021-06-fix-aarch64_darwin changing 1 files +1 −1-
promag commented at 9:09 AM on June 2, 2021: member
-
depends: Fix qt.mk for mac arm64 3b36395b96
- fanquake added the label Build system on Jun 2, 2021
-
promag commented at 10:45 AM on June 2, 2021: member
Is this fixing a native M1 depends build, or a cross-compile?
native
What is the current problem?
Before this PR, after building depends the configure gives errors like:
ld: warning: ignoring file /Users/joao/Projects/bitcoin-core/22054/depends/aarch64-apple-darwin20.3.0/lib/libQt5Widgets.a, building for macOS-arm64 but attempting to link with file built for macOS-x86_64 Undefined symbols for architecture arm64: "qt_static_plugin_QCocoaIntegrationPlugin()", referenced from: __GLOBAL__sub_I_conftest.cpp in conftest-7867ef.o "qRegisterStaticPluginFunction(QStaticPlugin)", referenced from: __GLOBAL__sub_I_conftest.cpp in conftest-7867ef.o ld: symbol(s) not found for architecture arm64 clang: error: linker command failed with exit code 1 (use -v to see invocation)Before it was
depends/arm-apple-darwin20.3.0. - fanquake requested review from jonasschnelli on Jun 2, 2021
- fanquake requested review from JeremyRubin on Jun 2, 2021
- hebasto approved
-
hebasto commented at 2:34 PM on June 2, 2021: member
ACK 3b36395b96c533dde47256b505cf1cbb2844c96e, I have reviewed the code and it looks OK, I agree it can be merged.
Did not test it on Apple M1.
- fanquake approved
-
fanquake commented at 1:03 PM on June 3, 2021: member
ACK 3b36395b96c533dde47256b505cf1cbb2844c96e
- fanquake merged this on Jun 3, 2021
- fanquake closed this on Jun 3, 2021
- promag deleted the branch on Jun 3, 2021
- sidhujag referenced this in commit 37833ab4d6 on Jun 3, 2021
- PastaPastaPasta referenced this in commit d103e5d2ea on Jun 27, 2021
- PastaPastaPasta referenced this in commit 3c5f30abee on Jun 28, 2021
- PastaPastaPasta referenced this in commit 2758e72270 on Jun 29, 2021
- PastaPastaPasta referenced this in commit 9f521a696e on Jul 1, 2021
- PastaPastaPasta referenced this in commit 63428b0248 on Jul 1, 2021
- PastaPastaPasta referenced this in commit 847240e965 on Sep 21, 2021
- PastaPastaPasta referenced this in commit 70c299770e on Sep 24, 2021
- kittywhiskers referenced this in commit dacdc51a1b on Oct 12, 2021
- gades referenced this in commit 23b5ebd583 on Apr 20, 2022
- gwillen referenced this in commit f26f9a1e49 on Jun 1, 2022
- DrahtBot locked this on Aug 16, 2022