phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-10 11:57:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

guix: Remove now-unnecessary gcc make flag

Browse source 
Previously, Guix would produce a gcc which did not know to use the SSP
function from glibc, and required a gcc make flag for it to do so, in my
attempt to fix it upstream I realized that this is no longer the case.

This can be verified by performing a Guix build and doing

  readelf -s ... | grep __stack_chk

to check that symbols are coming from glibc, and doing

  readelf -d ... | grep NEEDED | grep ssp

to see that libssp.so is not being depended on
This commit is contained in:
Carl Dong 2020-03-11 11:20:48 -04:00
parent 5c73645ac7
commit 0ae42a16c7
No known key found for this signature in database
GPG key ID: 0CC52153197991A5
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/guix/manifest.scm
View file

@ -21,17 +21,6 @@
(guix profiles) (guix profiles)
(guix utils)) (guix utils))
(define (make-ssp-fixed-gcc xgcc)
"Given a XGCC package, return a modified package that uses the SSP function
from glibc instead of from libssp.so. Taken from:
http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
(package
(inherit xgcc)
(arguments
(substitute-keyword-arguments (package-arguments xgcc)
((#:make-flags flags)
`(cons "gcc_cv_libc_provides_ssp=yes" ,flags))))))
(define (make-gcc-rpath-link xgcc) (define (make-gcc-rpath-link xgcc)
"Given a XGCC package, return a modified package that replace each instance of "Given a XGCC package, return a modified package that replace each instance of
-rpath in the default system spec that's inserted by Guix with -rpath-link" -rpath in the default system spec that's inserted by Guix with -rpath-link"
@ -104,8 +93,7 @@ chain for " target " development."))
(base-gcc-for-libc gcc-5) (base-gcc-for-libc gcc-5)
(base-kernel-headers linux-libre-headers-4.19) (base-kernel-headers linux-libre-headers-4.19)
(base-libc glibc-2.27) (base-libc glibc-2.27)
(base-gcc (make-gcc-rpath-link (base-gcc (make-gcc-rpath-link gcc-9)))
(make-ssp-fixed-gcc gcc-9))))
"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