Change Details

core#20482: > Add depends qt fix for ARM macs ---- core#22071: depends: latest config.guess and config.sub > depends: latest config.guess (2021-05-24) > depends: latest config.sub (2021-04-30) ---- core#22123: > depends: Fix qt.mk for mac arm64 ---- core#23583: build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake > build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake > > This change fixes qt build on M1 Apple Silicon > build, qt, macOS: Don't pass -device-option when building natively Note: The third commit is not necessary because we didn't backport core#22402 ---- This is a backport of core#20482, core#22071 and core#23583 Note that for now we don't claim to actually support Apple ARM, this is just to progress on other fronts (Qt bumping and hopefully guix) without skipping too many ARM related commits that would be harder to backport out of order.

[[https://github.com/bitcoin/bitcoin/pull/20482 | core#20482]]: > Add depends qt fix for ARM macs ---- [[https://github.com/bitcoin/bitcoin/pull/22071 | core#22071]]: depends: latest config.guess and config.sub > depends: latest config.guess (2021-05-24) > depends: latest config.sub (2021-04-30) ---- [[https://github.com/bitcoin/bitcoin/pull/22123 | core#22123]]: > depends: Fix qt.mk for mac arm64 ---- [[https://github.com/bitcoin/bitcoin/pull/23583 | core#23583]]: build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake > build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake > > This change fixes qt build on M1 Apple Silicon > build, qt, macOS: Don't pass -device-option when building natively Note: The third commit is not necessary because we didn't backport [[https://github.com/bitcoin/bitcoin/pull/22402 | core#22402]] ---- This is a backport of [[https://github.com/bitcoin/bitcoin/pull/20482 | core#20482]], [[https://github.com/bitcoin/bitcoin/pull/22071 | core#22071]] and [[https://github.com/bitcoin/bitcoin/pull/23583 | core#23583]] Note that for now we don't claim to actually support Apple ARM, this is just to progress on other fronts (Qt bumping and hopefully guix) without skipping too many ARM related commits that would be harder to backport out of order.

[[https://github.com/bitcoin/bitcoin/pull/20482 | core#20482:]]: > Add depends qt fix for ARM macs ---- [[https://github.com/bitcoin/bitcoin/pull/22071 | core#22071]]: depends: latest config.guess and config.sub > depends: latest config.guess (2021-05-24) > depends: latest config.sub (2021-04-30) ---- [[https://github.com/bitcoin/bitcoin/pull/22123 | core#22123:]]: > depends: Fix qt.mk for mac arm64 ---- [[https://github.com/bitcoin/bitcoin/pull/23583 | core#23583]]: build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake > build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake > > This change fixes qt build on M1 Apple Silicon > build, qt, macOS: Don't pass -device-option when building natively Note: The third commit is not necessary because we didn't backport [[https://github.com/bitcoin/bitcoin/pull/22402 | core#22402]] ---- This is a backport of [[https://github.com/bitcoin/bitcoin/pull/20482 | core#20482]], core#22071 and core#23583[[https://github.com/bitcoin/bitcoin/pull/22071 | core#22071]] and [[https://github.com/bitcoin/bitcoin/pull/23583 | core#23583]] Note that for now we don't claim to actually support Apple ARM, this is just to progress on other fronts (Qt bumping and hopefully guix) without skipping too many ARM related commits that would be harder to backport out of order.