Skip to content

Commit 4c42a13

Browse files
committed
Merge #18320: guix: Remove now-unnecessary gcc make flag
0ae42a1 guix: Remove now-unnecessary gcc make flag (Carl Dong) Pull request description: ``` 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 ``` ACKs for top commit: fanquake: ACK 0ae42a1 - ran a Guix build (hashes below) and checked all the linux binaries: Tree-SHA512: 701b91e7c323b12a29af9539cb2656d10ce0a93af573a02e57f0b7fea05a6e1819798536eadb24d0a17e7f35b503f5e863fee5e7409db1b8a3973c4375e49d4e
2 parents 9cc7eba + 0ae42a1 commit 4c42a13

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

contrib/guix/manifest.scm

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@
2121
(guix profiles)
2222
(guix utils))
2323

24-
(define (make-ssp-fixed-gcc xgcc)
25-
"Given a XGCC package, return a modified package that uses the SSP function
26-
from glibc instead of from libssp.so. Taken from:
27-
http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
28-
(package
29-
(inherit xgcc)
30-
(arguments
31-
(substitute-keyword-arguments (package-arguments xgcc)
32-
((#:make-flags flags)
33-
`(cons "gcc_cv_libc_provides_ssp=yes" ,flags))))))
34-
3524
(define (make-gcc-rpath-link xgcc)
3625
"Given a XGCC package, return a modified package that replace each instance of
3726
-rpath in the default system spec that's inserted by Guix with -rpath-link"
@@ -104,8 +93,7 @@ chain for " target " development."))
10493
(base-gcc-for-libc gcc-5)
10594
(base-kernel-headers linux-libre-headers-4.19)
10695
(base-libc glibc-2.27)
107-
(base-gcc (make-gcc-rpath-link
108-
(make-ssp-fixed-gcc gcc-9))))
96+
(base-gcc (make-gcc-rpath-link gcc-9)))
10997
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
11098
desirable for building Bitcoin Core release binaries."
11199
(make-cross-toolchain target

0 commit comments

Comments
 (0)