diff options
| author | Carl Dong <contact@carldong.me> | 2021-04-28 12:33:25 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-05-03 14:42:25 -0400 |
| commit | c90f6e51094a1ba4fb2aab35b78f23b6fda645d0 (patch) | |
| tree | 007a8bdaa6c139417a8c2b64bef9d1d14d4240fa /contrib | |
| parent | 8e1c06846edd743d93c1aacff02efd502d511b7e (diff) | |
| download | bitcoin-c90f6e51094a1ba4fb2aab35b78f23b6fda645d0.tar.xz | |
guix: Consistently use gcc-8 for $HOST
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/guix/libexec/build.sh | 2 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 6ea32329ba..e95617e2e2 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -255,7 +255,7 @@ case "$HOST" in esac case "$HOST" in - powerpc64-linux-*) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,-z,noexecstack" ;; + powerpc64-linux-*|riscv64-linux-*) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,-z,noexecstack" ;; esac # Make $HOST-specific native binaries from depends available in $PATH diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index d493eab14a..90f4121d43 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -129,7 +129,7 @@ chain for " target " development.")) (base-gcc-for-libc gcc-7) (base-kernel-headers linux-libre-headers-5.4) (base-libc glibc) ; glibc 2.31 - (base-gcc (make-gcc-rpath-link gcc-9))) + (base-gcc (make-gcc-rpath-link gcc-8))) "Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values desirable for building Bitcoin Core release binaries." (make-cross-toolchain target @@ -147,7 +147,7 @@ desirable for building Bitcoin Core release binaries." (pthreads-xlibc mingw-w64-x86_64-winpthreads) (pthreads-xgcc (make-gcc-with-pthreads (cross-gcc target - #:xgcc (make-ssp-fixed-gcc gcc-9) + #:xgcc (make-ssp-fixed-gcc gcc-8) #:xbinutils xbinutils #:libc pthreads-xlibc)))) ;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and |