diff options
| author | fanquake <fanquake@gmail.com> | 2023-11-22 17:16:54 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-11-22 17:17:12 +0000 |
| commit | 5d13b9586eb97f59d9bb53aae1d8c27dc052b61e (patch) | |
| tree | ae4914f2507b3ced36a16274dde1e080281ba5db /contrib/guix | |
| parent | 172cd92620167cc437f6d208a20f2698f15835a9 (diff) | |
| parent | f95af98128f17002bf137a48441167020f3ef9bb (diff) | |
| download | bitcoin-5d13b9586eb97f59d9bb53aae1d8c27dc052b61e.tar.xz | |
Merge bitcoin/bitcoin#28461: build: Windows SSP roundup
f95af98128f17002bf137a48441167020f3ef9bb guix: default ssp for Windows GCC (fanquake)
95d55b96c2cfd2a0d5a246d4a9eff9d0744ba223 guix: remove ssp workaround from Windows GCC (fanquake)
8f43302a0a1bb79129933e4cc174bf8d8d59ec15 build: remove explicit libssp linking from Windows build (fanquake)
Pull request description:
I was expecting this to fail to compile somewhere, maybe in the CI, but that doesn't seem to be the case?
Seems workable given the SSP related changes in the newer mingw-w64 headers (which are in Guix):
> Implement some of the stack protector functions/variables so -lssp is now optional when _FORTIFY_SOURCE or -fstack-protector-strong is used.
However I think this would still be broken in some older environments, so we might have to wait for a compiler bump, or similar. The optional -lssp also seems to work when using older headers, which doesn't make sense.
Would fix #28104.
ACKs for top commit:
hebasto:
ACK f95af98128f17002bf137a48441167020f3ef9bb, I've verified binaries from `bitcoin-f95af98128f1-win64.zip` on Windows 11 Pro 23H2.
TheCharlatan:
ACK f95af98128f17002bf137a48441167020f3ef9bb
Tree-SHA512: 71169ec513cfe692dfa7741d2bf37b45da05627c0af1cbd50cf8c3c04cc21c4bf88f3284532bddc1e3e648391ec78dbaca5170987a13c21ac204a7bcaf27f349
Diffstat (limited to 'contrib/guix')
| -rw-r--r-- | contrib/guix/manifest.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 7a030e5eab..8acce55aa3 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -411,12 +411,8 @@ inspecting signatures in Mach-O binaries.") `(append ,flags ;; https://gcc.gnu.org/install/configure.html (list "--enable-threads=posix", - building-on))) - ((#:make-flags flags) - ;; Uses the SSP functions from glibc instead of from libssp.so. - ;; Our 'symbol-check' script will complain if we link against libssp.so, - ;; and thus will ensure that this works properly. - `(cons "gcc_cv_libc_provides_ssp=yes" ,flags)))))) + "--enable-default-ssp=yes", + building-on))))))) (define-public linux-base-gcc (package |