diff options
| author | fanquake <fanquake@gmail.com> | 2023-03-27 14:55:11 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-03-27 14:55:27 +0100 |
| commit | b968424c25826cc7b4aa2ec1a5afdb59b41d3377 (patch) | |
| tree | b76ff4bae86971efb4546058a269f08a1223673e | |
| parent | 7fbc70395c9a41a6e5f8e2db0ce3dd0fe3ff7dd1 (diff) | |
| parent | 4becee396f3bda40832138dd1aaa90368ed31857 (diff) | |
Merge bitcoin/bitcoin#27326: guix: combine and document `enable_werror`
4becee396f3bda40832138dd1aaa90368ed31857 guix: combine and document enable_werror (fanquake)
Pull request description:
Combine into `hardened-glibc`.
Document why we don't use `--disable-werror` directly.
https://www.gnu.org/software/libc/manual/html_node/Configuring-and-compiling.html
> By default, the GNU C Library is built with -Werror. If you wish
> to build without this option (for example, if building with a
> newer version of GCC than this version of the GNU C Library was
> tested with, so new warnings cause the build with -Werror to fail),
> you can configure with --disable-werror.
ACKs for top commit:
hebasto:
ACK 4becee396f3bda40832138dd1aaa90368ed31857, the diff is correct.
TheCharlatan:
ACK 4becee396f3bda40832138dd1aaa90368ed31857
Tree-SHA512: 8724415f51b4d72d40c4e797faf52c93a81147fb629332b9388ffd7f113f2b16db3b7496bf3063dd978ac629fd5bde3ec7df4f1ff1ed714cb56f316a9334d119
| -rw-r--r-- | contrib/guix/manifest.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 0cfce41117..bfadaf3af0 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -150,7 +150,7 @@ chain for " target " development.")) #:key (base-gcc-for-libc base-gcc) (base-kernel-headers base-linux-kernel-headers) - (base-libc (hardened-glibc (make-glibc-without-werror glibc-2.27))) + (base-libc (hardened-glibc 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." @@ -535,15 +535,16 @@ and endian independent.") inspecting signatures in Mach-O binaries.") (license license:expat)))) -(define (make-glibc-without-werror glibc) - (package-with-extra-configure-variable glibc "enable_werror" "no")) - ;; https://www.gnu.org/software/libc/manual/html_node/Configuring-and-compiling.html +;; We don't use --disable-werror directly, as that would be passed through to bash, +;; and cause it's build to fail. (define (hardened-glibc glibc) (package-with-extra-configure-variable ( - package-with-extra-configure-variable glibc - "--enable-stack-protector" "all") - "--enable-bind-now" "yes")) + package-with-extra-configure-variable ( + package-with-extra-configure-variable glibc + "enable_werror" "no") + "--enable-stack-protector" "all") + "--enable-bind-now" "yes")) (define-public glibc-2.27 (package |