Merge bitcoin/bitcoin#33775: guix: use GCC 14.3.0 over 13.3.0
2a746500faci: migrate some jobs to Debian Trixie, use GCC 14 (fanquake)fb0e6edfe8guix: Apply SSA generation patch to maintain determinism (Mara van der Laan)34909799feguix: use GCC 14.3.0 over 13.3.0 (fanquake)47be9122a7guix: disable gprofng in GCC (fanquake)ea29329eb7guix: build GCC with --enable-host-bind-now (fanquake)6f54e267d0guix: disable libquadmath in GCC (fanquake)7735901ed2guix: disable building libgomp in GCC (fanquake) Pull request description: Switching to using GCC 14.x for release builds has come up multiple times recently. It will eventually be needed for #25573, and could also be useful for #30210. ACKs for top commit: hebasto: ACK2a746500fa. I have reviewed the code and it looks OK. The new GCC patch looks reasonable. theuni: utACK2a746500fasedited: ACK2a746500faTree-SHA512: 56912bed19386f06d52fb94e0ef6d96f5415ab2de8b5e94890806d7cc0b937a3c4b11cc161aa2e06ca2fd3c392ef7501c91688e0897e1c1c51aafa963f3e50d9
This commit is contained in:
8 files changed
+75
-10
No files matched your search
@@ -94,7 +94,17 @@ chain for " target " development."))
|
||||
(home-page (package-home-page xgcc))
|
||||
(license (package-license xgcc)))))
|
||||
|
||||
(define base-gcc gcc-13) ;; 13.3.0
|
||||
(define base-gcc
|
||||
(package
|
||||
(inherit gcc-14) ;; 14.2.0
|
||||
(version "14.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gcc/gcc-"
|
||||
version "/gcc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fna78ly417g69fdm4i5f3ms96g8xzzjza8gwp41lqr5fqlpgp70"))))))
|
||||
|
||||
(define base-linux-kernel-headers linux-libre-headers-6.1)
|
||||
|
||||
@@ -114,7 +124,7 @@ desirable for building Bitcoin Core release binaries."
|
||||
|
||||
(define (gcc-libgcc-patches gcc)
|
||||
(package-with-extra-patches gcc
|
||||
(search-our-patches "gcc-remap-guix-store.patch")))
|
||||
(search-our-patches "gcc-remap-guix-store.patch" "gcc-ssa-generation.patch")))
|
||||
|
||||
(define (binutils-mingw-patches binutils)
|
||||
(package-with-extra-patches binutils
|
||||
@@ -432,7 +442,9 @@ inspecting signatures in Mach-O binaries.")
|
||||
;; https://gcc.gnu.org/install/configure.html
|
||||
(list "--enable-threads=posix",
|
||||
"--enable-default-ssp=yes",
|
||||
"--enable-host-bind-now=yes",
|
||||
"--disable-gcov",
|
||||
"--disable-libgomp",
|
||||
building-on)))))))
|
||||
|
||||
(define-public linux-base-gcc
|
||||
@@ -446,9 +458,13 @@ inspecting signatures in Mach-O binaries.")
|
||||
(list "--enable-initfini-array=yes",
|
||||
"--enable-default-ssp=yes",
|
||||
"--enable-default-pie=yes",
|
||||
"--enable-host-bind-now=yes",
|
||||
"--enable-standard-branch-protection=yes",
|
||||
"--enable-cet=yes",
|
||||
"--enable-gprofng=no",
|
||||
"--disable-gcov",
|
||||
"--disable-libgomp",
|
||||
"--disable-libquadmath",
|
||||
"--disable-libsanitizer",
|
||||
building-on)))
|
||||
((#:phases phases)
|
||||
@@ -555,7 +571,7 @@ inspecting signatures in Mach-O binaries.")
|
||||
gzip
|
||||
xz
|
||||
;; Build tools
|
||||
gcc-toolchain-13
|
||||
gcc-toolchain-14
|
||||
cmake-minimal
|
||||
gnu-make
|
||||
ninja
|
||||
@@ -575,7 +591,7 @@ inspecting signatures in Mach-O binaries.")
|
||||
((string-contains target "-linux-")
|
||||
(list bison
|
||||
pkg-config
|
||||
(list gcc-toolchain-13 "static")
|
||||
(list gcc-toolchain-14 "static")
|
||||
(make-bitcoin-cross-toolchain target)))
|
||||
((string-contains target "darwin")
|
||||
(list clang-toolchain-19
|
||||
|
||||
Reference in new issue
Block a user