From 269f6a5f5251f3a8ea920690c243748f84a88408 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 12 Mar 2013 13:44:59 +0000 Subject: [PATCH] - Fixup makedist.sh for windows compile. git-svn-id: file:///svn/unbound/trunk@2858 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ makedist.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 000fbb897..79e10e08d 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +12 March 2013: Wouter + - Fixup makedist.sh for windows compile. + 11 March 2013: Wouter - iana portlist update. - testcode/ldns-testpkts.c check for makedist is informational. diff --git a/makedist.sh b/makedist.sh index 888783540..ef930bf7a 100755 --- a/makedist.sh +++ b/makedist.sh @@ -191,7 +191,7 @@ if [ "$DOWIN" = "yes" ]; then info "Crosscompile windows dist" cross="yes" configure="mingw32-configure" - strip="i686-pc-mingw32-strip" + strip="i686-w64-mingw32-strip" makensis="makensis" # from mingw32-nsis package # flags for crosscompiled dependency libraries cross_flag="" @@ -208,7 +208,7 @@ if [ "$DOWIN" = "yes" ]; then cd openssl-* || error_cleanup "no openssl-X dir in tarball" # configure for crosscompile, without CAPI because it fails # cross-compilation and it is not used anyway - sslflags="no-asm --cross-compile-prefix=i686-pc-mingw32- -DOPENSSL_NO_CAPIENG mingw" + sslflags="no-asm --cross-compile-prefix=i686-w64-mingw32- -DOPENSSL_NO_CAPIENG mingw" info "winssl: Configure $sslflags" ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed" info "winssl: make"