aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2021-07-07 20:59:25 +0800
committerfanquake <fanquake@gmail.com>2021-07-07 20:59:35 +0800
commit4129134e844f78a89f8515cf30dad4b6074703c7 (patch)
treeba97898455dbe162eb5d381fdd32338a9fa278b4 /.gitattributes
parent137f3b9ba3857b879e934a93847520ed91bc4eb2 (diff)
parentcdb41d5573b1e2ed1bc1d8d1dc9f77e82672ee1f (diff)
Merge bitcoin/bitcoin#22402: doc: Install Rosetta on M1-macOS for qt in depends
cdb41d5573b1e2ed1bc1d8d1dc9f77e82672ee1f doc: Install Rosetta on M1-macOS for qt in depends (Hennadii Stepanov) Pull request description: On master (c609e10545492aba480ff17aff7eefc13a0b5cd8) `make -C depends qt` on Apple Silicon based macOS 11.4 ends with an error: ``` /bin/sh: /Users/hebasto/bitcoin/depends/work/build/aarch64-apple-darwin20.5.0/qt/5.12.11-6c4d47a8f8f/qtbase/bin/moc: Bad CPU type in executable ``` Installing Rosetta 2 fixes it. Explanation. On Apple Silicon macOS the `qt` package in depends actually is cross compiled. All native tools (including `moc`) are x86_64 binaries, that require Rosetta 2 to run. ACKs for top commit: promag: ACK cdb41d5573b1e2ed1bc1d8d1dc9f77e82672ee1f. fanquake: ACK cdb41d5573b1e2ed1bc1d8d1dc9f77e82672ee1f - I have not tested after installing Rosetta 2, but I saw the same issue during my first cross-compile on an M1 box. Zero-1729: ACK cdb41d5573b1e2ed1bc1d8d1dc9f77e82672ee1f Tree-SHA512: fb06a32d6fb40f405ce856b44f5d3af0c51089886f3be79e509e5c325614d7af58ce4480c064c17e0efb695a1f69f68d533c417f9631d46d8a630aba60ce4433
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions