highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-06 13:47:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

guix: combine gcc-libgcc-patches with base-gcc

Browse Source
This commit is contained in:
fanquake
2026-02-12 12:03:25 +00:00
parent 2276426bb1
commit ab9a98b1e4
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/guix/manifest.scm
View File

@@ -92,16 +92,18 @@ chain for " target " development."))
(home-page (package-home-page xgcc))
(license (package-license xgcc)))))
(define base-gcc gcc-14)
(define base-gcc
(package-with-extra-patches gcc-14
(search-our-patches "gcc-remap-guix-store.patch" "gcc-ssa-generation.patch")))
(define base-linux-kernel-headers linux-libre-headers-6.1)
(define* (make-bitcoin-cross-toolchain target
#:key
(base-gcc-for-libc (gcc-libgcc-patches linux-base-gcc))
(base-gcc-for-libc linux-base-gcc)
(base-kernel-headers base-linux-kernel-headers)
(base-libc glibc-2.31)
(base-gcc (gcc-libgcc-patches linux-base-gcc)))
(base-gcc linux-base-gcc))
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
desirable for building Bitcoin Core release binaries."
(make-cross-toolchain target
@@ -110,10 +112,6 @@ desirable for building Bitcoin Core release binaries."
base-libc
base-gcc))
(define (gcc-libgcc-patches gcc)
(package-with-extra-patches gcc
(search-our-patches "gcc-remap-guix-store.patch" "gcc-ssa-generation.patch")))
(define (binutils-mingw-patches binutils)
(package-with-extra-patches binutils
(search-our-patches "binutils-unaligned-default.patch")))
@@ -127,10 +125,10 @@ desirable for building Bitcoin Core release binaries."
(let* ((xbinutils (binutils-mingw-patches (cross-binutils target)))
(machine (substring target 0 (string-index target #\-)))
(pthreads-xlibc (winpthreads-patches (make-mingw-w64 machine
#:xgcc (cross-gcc target #:xgcc (gcc-libgcc-patches base-gcc))
#:xgcc (cross-gcc target #:xgcc base-gcc)
#:with-winpthreads? #t)))
(pthreads-xgcc (cross-gcc target
#:xgcc (gcc-libgcc-patches mingw-w64-base-gcc)
#:xgcc mingw-w64-base-gcc
#:xbinutils xbinutils
#:libc pthreads-xlibc)))
;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and