aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2020-03-25 17:17:14 -0400
committerCarl Dong <contact@carldong.me>2020-04-02 17:20:02 -0400
commitff821dd2a1c600488d11e7d9a20e9179ecc9144b (patch)
treea9b882d2b4b8697615e9936e592a2a4608c0bdbc /contrib
parent360a9e0ad50a36ec79a1a160dbed3966689fd41c (diff)
downloadbitcoin-ff821dd2a1c600488d11e7d9a20e9179ecc9144b.tar.xz
guix: Reinstate make-ssp-fixed-gcc
Unfortunately, gcc is still not smart enough to detect whether or not mingw-w64 provides ssp, so let's put it back just for mingw-w64.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/guix/manifest.scm11
1 files changed, 11 insertions, 0 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 4e99a792cd..c698bf0763 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -24,6 +24,17 @@
(guix profiles)
(guix utils))
+(define (make-ssp-fixed-gcc xgcc)
+ "Given a XGCC package, return a modified package that uses the SSP function
+from glibc instead of from libssp.so. Taken from:
+http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
+ (package
+ (inherit xgcc)
+ (arguments
+ (substitute-keyword-arguments (package-arguments xgcc)
+ ((#:make-flags flags)
+ `(cons "gcc_cv_libc_provides_ssp=yes" ,flags))))))
+
(define (make-gcc-rpath-link xgcc)
"Given a XGCC package, return a modified package that replace each instance of
-rpath in the default system spec that's inserted by Guix with -rpath-link"