Skip to content

Commit dcad5f7

Browse files
committed
guix: consolidate kernel headers to 5.15
Given no reason to use an older version of the kernel headers for the non-RISCV linux builds, consolidate all Linux builds to 5.15.x. Note that using older kernel headers isn't some sort of compatibility "hack", and glibc explicitly recommends against doing so. See: https://sourceware.org/glibc/wiki/FAQ#What_version_of_the_Linux_kernel_headers_should_be_used.3F.
1 parent 9446de1 commit dcad5f7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

contrib/guix/manifest.scm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ chain for " target " development."))
130130
(license (package-license xgcc)))))
131131

132132
(define base-gcc gcc-10)
133+
(define base-linux-kernel-headers linux-libre-headers-5.15)
133134

134135
;; Building glibc with stack smashing protector first landed in glibc 2.25, use
135136
;; this function to disable for older glibcs
@@ -148,7 +149,7 @@ chain for " target " development."))
148149
(define* (make-bitcoin-cross-toolchain target
149150
#:key
150151
(base-gcc-for-libc gcc-7)
151-
(base-kernel-headers linux-libre-headers-4.9)
152+
(base-kernel-headers base-linux-kernel-headers)
152153
(base-libc (make-glibc-without-ssp glibc-2.24))
153154
(base-gcc (make-gcc-rpath-link base-gcc)))
154155
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
@@ -604,7 +605,7 @@ inspecting signatures in Mach-O binaries.")
604605
(cond ((string-contains target "riscv64-")
605606
(make-bitcoin-cross-toolchain target
606607
#:base-libc glibc-2.27/bitcoin-patched
607-
#:base-kernel-headers linux-libre-headers-4.19))
608+
#:base-kernel-headers base-linux-kernel-headers))
608609
(else
609610
(make-bitcoin-cross-toolchain target)))))
610611
((string-contains target "darwin")

0 commit comments

Comments
 (0)