Skip to content

Commit 00a9b06

Browse files
committed
Merge bitcoin/bitcoin#21799: guix: Use gcc-8 across the board
c90f6e5 guix: Consistently use gcc-8 for $HOST (Carl Dong) Pull request description: Only non-base commit is the last commit: bitcoin/bitcoin@b5abb07 Right now, here's what we use in Gitian: - Linux: Focal's [`g++-8-<arch>-linux-gnu`](https://packages.ubuntu.com/focal/g++-8-aarch64-linux-gnu) (`8.4.0-3ubuntu1cross1`) - MinGW-w64: Focal's [`g++-mingw-w64`](https://packages.ubuntu.com/focal/g++-mingw-w64) (`9.3.0-7ubuntu1+22~exp1ubuntu4`) In Guix right now we use `gcc-9` across the board. I think it makes more sense to use `gcc-8` across the board, as it doesn't suffer from the `memcmp` bug, and is what debian buster (stable) does, meaning it will be well tested ([`g++-mingw-w64`](https://packages.debian.org/buster/g++-mingw-w64), [`g++-aarch64-linux-gnu`](https://packages.debian.org/buster/g++-aarch64-linux-gnu)). We can accomplish this somewhat easily using Guix as we have tighter control over the toolchain (see: bitcoin/bitcoin@b5abb07). Let me know your thoughts! ACKs for top commit: MarcoFalke: Approach ACK c90f6e5, haven't reviewed laanwj: Code review ACK c90f6e5 hebasto: ACK c90f6e5, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 3e5b9297305232273323aa745ec417ed1be2418ead0e432db7742f5d5f45efe6e4a2ed44328731512cff4bfde80e5f2dc350a131b8b8fb9207a2ef66bce27ed2
2 parents 779aaa7 + c90f6e5 commit 00a9b06

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)