make validate work on Windows

This includes automatically adding --build=i386-unknown-mingw32 and
--with-gcc to ./configure, and disabling -j2 (see #1559).

Also: you can now say 

  CPUS=3 ./validate

and the script will pass -jN to make (where N = $CPUS + 1).  In the
future, when we fix #1558, it can pass THREADS=N to the testsuite, too.

1 files changed, 21 insertions, 3 deletions

diff --git a/validate b/validate
index 39fa819cd1..7949d6299f 100644
--- a/validate
+++ b/validate
@@ -16,12 +16,30 @@ cat mk/build.mk.sample >>mk/build.mk
 # e.g. you could add GhcLibWays=p to test profiling.
 echo '-include $(TOP)/mk/validate.mk' >>mk/build.mk
 
+case $OSTYPE in
+  cygwin|msys) config_args=--build=i386-unknown-mingw32
+               if [ -f c:/mingw/bin/gcc.exe ]; then
+                   config_args="$config_args --with-gcc=c:/mingw/bin/gcc"
+               fi
+               ;;
+esac
+
+if [ "$CPUS" = "" ]; then
+   # ToDo: make -j doesn't work in libraries/ on Windows (see #1559)
+   case $OSTYPE in
+       cygwin|msys) threads=1;;
+       *)           threads=2;;
+   esac
+else
+   threads=`expr $CPUS + 1`
+fi
+
 sh boot
-./configure
-# ToDo: configure args
+./configure $config_args
 
-make -j2
+make -j$threads
 
+# ToDo: use THREADS=$threads, see #1558
 make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
 
 if