mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-05 14:06:27 -05:00
guix: remove explicit glibc stack protector disabling
While glibc 2.25 and newer *can* be built with stack-smashing-protection enabled, it isn't used by default, and still isn't, as of glibc 2.35, so I can't see a reason to explicitly disable it. I'd also like to move in the direction of enabling, by default, hardening options for the toolchains we build, so removing the explicit disabling is a step in that direction. Will be following up with some changes based on this PR.
This commit is contained in:
parent
1d39c9ca06
commit
4e569c8bd8
1 changed files with 1 additions and 15 deletions
|
@ -132,25 +132,11 @@ chain for " target " development."))
|
|||
(define base-gcc gcc-10)
|
||||
(define base-linux-kernel-headers linux-libre-headers-5.15)
|
||||
|
||||
;; Building glibc with stack smashing protector first landed in glibc 2.25, use
|
||||
;; this function to disable for older glibcs
|
||||
;;
|
||||
;; From glibc 2.25 changelog:
|
||||
;;
|
||||
;; * Most of glibc can now be built with the stack smashing protector enabled.
|
||||
;; It is recommended to build glibc with --enable-stack-protector=strong.
|
||||
;; Implemented by Nick Alcock (Oracle).
|
||||
(define (make-glibc-without-ssp xglibc)
|
||||
(package-with-extra-configure-variable
|
||||
(package-with-extra-configure-variable
|
||||
xglibc "libc_cv_ssp" "no")
|
||||
"libc_cv_ssp_strong" "no"))
|
||||
|
||||
(define* (make-bitcoin-cross-toolchain target
|
||||
#:key
|
||||
(base-gcc-for-libc base-gcc)
|
||||
(base-kernel-headers base-linux-kernel-headers)
|
||||
(base-libc (make-glibc-without-ssp (make-glibc-without-werror glibc-2.24)))
|
||||
(base-libc (make-glibc-without-werror glibc-2.24))
|
||||
(base-gcc (make-gcc-rpath-link base-gcc)))
|
||||
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
|
||||
desirable for building Bitcoin Core release binaries."
|
||||
|
|
Loading…
Add table
Reference in a new issue