[PATCH] setup: support i686-w64-mingw32 in bootstrap

["Yaakov (Cygwin/X)" <yselkowitz@users.sourceforge.net>]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

Now that setup.exe prerequisites are in the distro for i686-w64-mingw32,
this can replace the decrepit gcc3 -mno-cygwin as an equally valid
alternative for bootstrap.sh.  Patch attached.


Yaakov


[-- Attachment #2: bootstrap-mingw64.patch --]
[-- Type: text/x-patch, Size: 912 bytes --]

2012-10-19  Yaakov Selkowitz  <yselkowitz@...>

	* bootstrap.sh: Add support for i686-w64-mingw32 toolchain.
	Remove support for gcc-3 -mno-cygwin.

Index: bootstrap.sh
===================================================================
RCS file: /cvs/cygwin-apps/setup/bootstrap.sh,v
retrieving revision 2.7
diff -u -p -r2.7 bootstrap.sh
--- bootstrap.sh	13 Sep 2012 03:45:01 -0000	2.7
+++ bootstrap.sh	19 Oct 2012 15:31:06 -0000
@@ -50,14 +50,14 @@ fi
 cd "$builddir"
 
 build=`$srcdir/cfgaux/config.guess`
-host="i686-pc-mingw32"
 
-if hash $host-g++ 2> /dev/null; then
-	CC="$host-gcc"
-	CXX="$host-g++"
+if hash i686-w64-mingw32-g++ 2> /dev/null; then
+	host="i686-w64-mingw32"
+elif hash i686-pc-mingw32-g++ 2> /dev/null; then
+	host="i686-pc-mingw32"
 else
-	CC="gcc-3 -mno-cygwin"
-	CXX="g++-3 -mno-cygwin"
+	echo "mingw32-target g++ required for building setup"
+	exit 1
 fi
 
 echo "running configure"