X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=1852358da6a1be84262b1eb2156a64f1b52bba7b;hp=39fa819cd13dac705f9f4f4aaecdb940812b5408;hb=e2424a6c39f2bc25e8c034af3d539455e937213e;hpb=17c564cd00a506080b4f8436c0153296a3c86766

diff --git a/validate b/validate
index 39fa819..1852358 100644
--- a/validate
+++ b/validate
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ -f mk/config.mk ]; then
    make distclean
@@ -16,12 +18,26 @@ 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
+    threads=2
+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