Skip to content

Commit 4e569c8

Browse files
committed
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.
1 parent 1d39c9c commit 4e569c8

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

contrib/guix/manifest.scm

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,25 +132,11 @@ chain for " target " development."))
132132
(define base-gcc gcc-10)
133133
(define base-linux-kernel-headers linux-libre-headers-5.15)
134134

135-
;; Building glibc with stack smashing protector first landed in glibc 2.25, use
136-
;; this function to disable for older glibcs
137-
;;
138-
;; From glibc 2.25 changelog:
139-
;;
140-
;; * Most of glibc can now be built with the stack smashing protector enabled.
141-
;; It is recommended to build glibc with --enable-stack-protector=strong.
142-
;; Implemented by Nick Alcock (Oracle).
143-
(define (make-glibc-without-ssp xglibc)
144-
(package-with-extra-configure-variable
145-
(package-with-extra-configure-variable
146-
xglibc "libc_cv_ssp" "no")
147-
"libc_cv_ssp_strong" "no"))
148-
149135
(define* (make-bitcoin-cross-toolchain target
150136
#:key
151137
(base-gcc-for-libc base-gcc)
152138
(base-kernel-headers base-linux-kernel-headers)
153-
(base-libc (make-glibc-without-ssp (make-glibc-without-werror glibc-2.24)))
139+
(base-libc (make-glibc-without-werror glibc-2.24))
154140
(base-gcc (make-gcc-rpath-link base-gcc)))
155141
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
156142
desirable for building Bitcoin Core release binaries."

0 commit comments

Comments
 (0)