aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2020-03-30 13:41:34 -0400
committerCarl Dong <contact@carldong.me>2020-04-02 17:20:05 -0400
commit35a96792dda9e78165b1598aeac7b2ab759e7be5 (patch)
treee5a1fae356804c55305d9429882341c8a1760bc7
parent449d8fe25bbe25daacfc67aa89ca32b0a3254c5a (diff)
guix: Check mingw symbols, improve SSP fix docs
-rw-r--r--contrib/guix/libexec/build.sh2
-rw-r--r--contrib/guix/manifest.scm5
2 files changed, 5 insertions, 2 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 5d09e6b510..94ff9c273d 100644
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -211,7 +211,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
make -C src --jobs=1 check-security ${V:+V=1}
case "$HOST" in
- *linux*)
+ *linux*|*mingw*)
# Check that executables only contain allowed gcc, glibc and libstdc++
# version symbols for Linux distro back-compatibility.
make -C src --jobs=1 check-symbols ${V:+V=1}
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index c698bf0763..c9d7193c85 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -26,7 +26,10 @@
(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:
+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.
+
+Taken from:
http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
(package
(inherit xgcc)