Skip to content

Commit c33b199

Browse files
committed
guix: Bump glibc and linux-headers
Bump glibc and linux-headers to match those of our Gitian counterparts. We also require a glibc >= 2.28 for the test-symbol-check scripts to work properly. The default BASE-GCC-FOR-LIBC also has to be bumped since glibc 2.31 requires a gcc >= 6.2
1 parent 65363a1 commit c33b199

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

contrib/guix/manifest.scm

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ chain for " target " development."))
125125

126126
(define* (make-bitcoin-cross-toolchain target
127127
#:key
128-
(base-gcc-for-libc gcc-5)
129-
(base-kernel-headers linux-libre-headers-4.19)
130-
(base-libc glibc-2.27)
128+
(base-gcc-for-libc gcc-7)
129+
(base-kernel-headers linux-libre-headers-5.4)
130+
(base-libc glibc) ; glibc 2.31
131131
(base-gcc (make-gcc-rpath-link gcc-9)))
132132
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
133133
desirable for building Bitcoin Core release binaries."
@@ -232,12 +232,6 @@ chain for " target " development."))
232232
(list zip
233233
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
234234
(make-nsis-with-sde-support nsis-x86_64)))
235-
((string-contains target "riscv64-linux-")
236-
(list (make-bitcoin-cross-toolchain target
237-
#:base-gcc-for-libc gcc-7)))
238-
((string-contains target "powerpc64le-linux-")
239-
(list (make-bitcoin-cross-toolchain target
240-
#:base-gcc-for-libc gcc-7)))
241235
((string-contains target "-linux-")
242236
(list (make-bitcoin-cross-toolchain target)))
243237
((string-contains target "darwin")

0 commit comments

Comments
 (0)