- Fix windows 64bit build for libssp dependency.

diff --git a/doc/Changelog b/doc/Changelog
index f90010638ed7ced8ef1bd4d38a71f5922d2824f5..8c99aceafa4eada691f46a4df186d916690410ad 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 29 April 2026: Wouter
        - tag for 1.25.0. The code repository continues with 1.25.1 in
          development.
+       - Fix windows 64bit build for libssp dependency.
 
 23 April 2026: Wouter
        - Merge #1441: Fix buffer overrun in

diff --git a/makedist.sh b/makedist.sh
index ca2a88b44011e87963ae6396917d6270645c4d3c..ec9021c2ccc425c3ab8124345b609a341d1a2abb 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -466,9 +466,13 @@ if [ "$DOWIN" = "yes" ]; then
                || error_cleanup "Could not configure"
                set +x
     else
+               # Add -l:libssp:a to statically link libssp if possible.
+               # Put it at the end of LIBS, to satisfy also linked in
+               # dependencies.
                set -x
                $configure --enable-debug --enable-static-exe --disable-flto --disable-gost $* $cross_flag \
                || error_cleanup "Could not configure"
+               sed -i Makefile -e 's/^\(LIBS=.*\)$/\1 -l:libssp.a/'
                set +x
     fi
     info "Calling make"
@@ -485,6 +489,7 @@ if [ "$DOWIN" = "yes" ]; then
                || error_cleanup "Could not configure"
                set +x
     else
+               # Do not add -l:libssp:a statically because it is a shared build.
                set -x
                $configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag \
                || error_cleanup "Could not configure"