From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 21 Sep 2021 07:23:38 +0000 (+0200)
Subject: - Fix crosscompile shell syntax.
X-Git-Tag: release-1.14.0rc1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24d0dc1725be0965c2358b3ee7939b53f6f0de3d;p=thirdparty%2Funbound.git

- Fix crosscompile shell syntax.
---

diff --git a/doc/Changelog b/doc/Changelog
index 59864127e..f24cd7274 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 21 September 2021: Wouter
 	- For crosscompile on windows, detect 64bit stackprotector library.
+	- Fix crosscompile shell syntax.
 
 20 September 2021: Wouter
 	- Fix crosscompile on windows to work with openssl 3.0.0 the
diff --git a/makedist.sh b/makedist.sh
index cfe2d727a..f288383fa 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -274,14 +274,14 @@ if [ "$DOWIN" = "yes" ]; then
 		if test "$W64" = "yes" -a -f /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll; then
 			# stack protector lib needs to link in to make
 			# -lws2_32 work in openssl link stage
-			SSPLIB="__CNF_LDLIBS=-l:libssp.a"
+			SSPLIB="-l:libssp.a"
 		else
 			# disable SSPLIB for 32bit or if no such file
 			SSPLIB=""
 		fi
 		info "winssl: Configure no-shared $sslflags"
 		set -x # echo the configure command
-		$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" no-shared $sslflags || error_cleanup "OpenSSL Configure failed"
+		__CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" no-shared $sslflags || error_cleanup "OpenSSL Configure failed"
 		set +x
 		info "winssl: make"
 		make $MINJ || error_cleanup "OpenSSL crosscompile failed"
@@ -296,7 +296,7 @@ if [ "$DOWIN" = "yes" ]; then
 		cd openssl_shared
 		info "winssl: Configure shared $sslflags"
 		set -x # echo the configure command
-		$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslsharedinstall" shared $sslflags || error_cleanup "OpenSSL Configure failed"
+		__CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslsharedinstall" shared $sslflags || error_cleanup "OpenSSL Configure failed"
 		set +x
 		info "winssl: make"
 		make $MINJ || error_cleanup "OpenSSL crosscompile failed"