diff options
| author | fanquake <fanquake@gmail.com> | 2023-01-26 10:30:41 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-02-13 14:16:59 +0000 |
| commit | d5d4b75840b4219495ed0fc421a4b71e757224ee (patch) | |
| tree | 64dcf4f64477ff786fdb92c9acb1b80544a40979 /contrib/guix | |
| parent | c49f2b8eb5d70aea76e2aa06cdfcb2cc9fa1cb53 (diff) | |
guix: combine glibc hardening options into hardened-glibc
Diffstat (limited to 'contrib/guix')
| -rw-r--r-- | contrib/guix/manifest.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index e148591517..379ad898c4 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -147,7 +147,7 @@ chain for " target " development.")) #:key (base-gcc-for-libc base-gcc) (base-kernel-headers base-linux-kernel-headers) - (base-libc (make-glibc-with-stack-protector (make-glibc-with-bind-now (make-glibc-without-werror glibc-2.27)))) + (base-libc (hardened-glibc (make-glibc-without-werror glibc-2.27))) (base-gcc (make-gcc-rpath-link (hardened-gcc base-gcc)))) "Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values desirable for building Bitcoin Core release binaries." @@ -537,11 +537,12 @@ inspecting signatures in Mach-O binaries.") (define (make-glibc-without-werror glibc) (package-with-extra-configure-variable glibc "enable_werror" "no")) -(define (make-glibc-with-stack-protector glibc) - (package-with-extra-configure-variable glibc "--enable-stack-protector" "all")) - -(define (make-glibc-with-bind-now glibc) - (package-with-extra-configure-variable glibc "--enable-bind-now" "yes")) +;; https://www.gnu.org/software/libc/manual/html_node/Configuring-and-compiling.html +(define (hardened-glibc glibc) + (package-with-extra-configure-variable ( + package-with-extra-configure-variable glibc + "--enable-stack-protector" "all") + "--enable-bind-now" "yes")) (define-public glibc-2.27 (package |