Commit ab8e05e
committed
Merge bitcoin/bitcoin#30511: guix: GCC 12 consolidation
d1592d2 guix: use gcc-12 to compile winpthreads (fanquake)
b23690e guix: use GCC 12.4.0 over 12.3.0 (fanquake)
8b41ede 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 bitcoin/bitcoin#30452 (comment).
ACKs for top commit:
TheCharlatan:
ACK d1592d2
hebasto:
ACK d1592d2.
Tree-SHA512: e3aa1fa3e69500c93180e07cb4684661247ec6bc45245f746538d81406ff1d8777131590307496dda3287a112b6633e4991168586ca4c2036fa3a57b1efa9c871 file changed
+21
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
91 | 92 | | |
92 | 93 | | |
93 | 94 | | |
94 | | - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
95 | 107 | | |
96 | 108 | | |
97 | 109 | | |
| |||
119 | 131 | | |
120 | 132 | | |
121 | 133 | | |
122 | | - | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
123 | 138 | | |
124 | 139 | | |
125 | 140 | | |
| |||
500 | 515 | | |
501 | 516 | | |
502 | 517 | | |
| 518 | + | |
503 | 519 | | |
504 | 520 | | |
505 | 521 | | |
| |||
515 | 531 | | |
516 | 532 | | |
517 | 533 | | |
518 | | - | |
519 | | - | |
520 | | - | |
| 534 | + | |
521 | 535 | | |
522 | 536 | | |
523 | 537 | | |
524 | 538 | | |
525 | 539 | | |
526 | | - | |
527 | | - | |
528 | | - | |
| 540 | + | |
529 | 541 | | |
530 | 542 | | |
531 | | - | |
532 | | - | |
533 | | - | |
| 543 | + | |
534 | 544 | | |
535 | 545 | | |
536 | 546 | | |
| |||
0 commit comments