Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-20 15:10:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

guix: Consistently use gcc-8 for $HOST

Browse Source
This commit is contained in:
Carl Dong 2021-04-28 12:33:25 -04:00
parent 8e1c06846e
commit c90f6e5109
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/guix/libexec/build.sh
View File

@ -255,7 +255,7 @@ case "$HOST" in
esac esac
case "$HOST" in case "$HOST" in
powerpc64-linux-*) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,-z,noexecstack" ;; powerpc64-linux-*|riscv64-linux-*) HOST_LDFLAGS="${HOST_LDFLAGS} -Wl,-z,noexecstack" ;;
esac esac
# Make $HOST-specific native binaries from depends available in $PATH # Make $HOST-specific native binaries from depends available in $PATH

4
contrib/guix/manifest.scm
View File

@ -129,7 +129,7 @@ chain for " target " development."))
(base-gcc-for-libc gcc-7) (base-gcc-for-libc gcc-7)
(base-kernel-headers linux-libre-headers-5.4) (base-kernel-headers linux-libre-headers-5.4)
(base-libc glibc) ; glibc 2.31 (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 "Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
desirable for building Bitcoin Core release binaries." desirable for building Bitcoin Core release binaries."
(make-cross-toolchain target (make-cross-toolchain target
@ -147,7 +147,7 @@ desirable for building Bitcoin Core release binaries."
(pthreads-xlibc mingw-w64-x86_64-winpthreads) (pthreads-xlibc mingw-w64-x86_64-winpthreads)
(pthreads-xgcc (make-gcc-with-pthreads (pthreads-xgcc (make-gcc-with-pthreads
(cross-gcc target (cross-gcc target
#:xgcc (make-ssp-fixed-gcc gcc-9) #:xgcc (make-ssp-fixed-gcc gcc-8)
#:xbinutils xbinutils #:xbinutils xbinutils
#:libc pthreads-xlibc)))) #:libc pthreads-xlibc))))
;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and ;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and