Skip to content

Commit c90f6e5

Browse files
committed
guix: Consistently use gcc-8 for $HOST
1 parent 8e1c068 commit c90f6e5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ case "$HOST" in
255255
esac
256256

257257
case "$HOST" in
258-
powerpc64-linux-*) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,-z,noexecstack" ;;
258+
powerpc64-linux-*|riscv64-linux-*) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,-z,noexecstack" ;;
259259
esac
260260

261261
# Make $HOST-specific native binaries from depends available in $PATH

contrib/guix/manifest.scm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ chain for " target " development."))
129129
(base-gcc-for-libc gcc-7)
130130
(base-kernel-headers linux-libre-headers-5.4)
131131
(base-libc glibc) ; glibc 2.31
132-
(base-gcc (make-gcc-rpath-link gcc-9)))
132+
(base-gcc (make-gcc-rpath-link gcc-8)))
133133
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
134134
desirable for building Bitcoin Core release binaries."
135135
(make-cross-toolchain target
@@ -147,7 +147,7 @@ desirable for building Bitcoin Core release binaries."
147147
(pthreads-xlibc mingw-w64-x86_64-winpthreads)
148148
(pthreads-xgcc (make-gcc-with-pthreads
149149
(cross-gcc target
150-
#:xgcc (make-ssp-fixed-gcc gcc-9)
150+
#:xgcc (make-ssp-fixed-gcc gcc-8)
151151
#:xbinutils xbinutils
152152
#:libc pthreads-xlibc))))
153153
;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and

0 commit comments

Comments
 (0)