diff options
| author | merge-script <fanquake@gmail.com> | 2024-07-25 13:58:34 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-07-25 13:58:34 +0100 |
| commit | ab8e05eb531f28fddf39ccb4d24ee54d0aa30dbe (patch) | |
| tree | 8ce5e99128d00c4613d0c07b9106b15038fb4faa /src/test/fuzz/cluster_linearize.cpp | |
| parent | bee23ce9ec3dc68def1eb9141a6be451e5053711 (diff) | |
| parent | d1592d2eee1913e734a4f92907e796eb3350c64a (diff) | |
Merge bitcoin/bitcoin#30511: guix: GCC 12 consolidation
d1592d2eee1913e734a4f92907e796eb3350c64a guix: use gcc-12 to compile winpthreads (fanquake)
b23690e8216f2b47e8e2c21a9ff057b25c4083ae guix: use GCC 12.4.0 over 12.3.0 (fanquake)
8b41ede55ebbc6978deb3f4fad5e18b76b372506 guix: consolidate back to GCC 12 toolchain for all HOSTS (fanquake)
Pull request description:
This PR contains 3 changes:
* Bump GCC in Guix from [12.3.0 to 12.4.0](https://gcc.gnu.org/gcc-12/). A patch was sent upstream, https://lists.gnu.org/archive/html/guix-patches/2024-06/msg01025.html, but has not landed.
* Consolidate all build environments back to using a GCC 12 toolchain. After #21778, the macOS environment is no-longer pinned to 11 (12 would otherwise cause issues building cctools). So, instead of requiring all builders to compile an additional GCC toolchain, use 12.
* Use GCC 12 to compile winpthreads. Currently, GCC 11 is used; which became apparent in https://github.com/bitcoin/bitcoin/pull/30452#issuecomment-2244715566.
ACKs for top commit:
TheCharlatan:
ACK d1592d2eee1913e734a4f92907e796eb3350c64a
hebasto:
ACK d1592d2eee1913e734a4f92907e796eb3350c64a.
Tree-SHA512: e3aa1fa3e69500c93180e07cb4684661247ec6bc45245f746538d81406ff1d8777131590307496dda3287a112b6633e4991168586ca4c2036fa3a57b1efa9c87
Diffstat (limited to 'src/test/fuzz/cluster_linearize.cpp')
0 files changed, 0 insertions, 0 deletions