X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=5becd3fb0c863182d7b56ab0d70d9b1bda13425f;hp=91b7f33822a1db1ba0118158793faa963938a137;hb=e95ee1f718c6915c478005aad8af81705357d6ab;hpb=4736d202fca9612e9738ce85d96bcb1ee15ce3a2

diff --git a/validate b/validate
index 91b7f33..5becd3f 100644
--- a/validate
+++ b/validate
@@ -45,36 +45,35 @@ do
     shift
 done
 
-if [ "$CPUS" = "" ]; then
-    threads=2
+if [ "$THREADS" = "" ]; then
+    if [ "$CPUS" = "" ]; then
+        threads=2
+    else
+        threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    fi
 else
-    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    threads="$THREADS"
+fi
+
+if type gmake > /dev/null 2> /dev/null
+then
+    make="gmake"
+else
+    make="make"
 fi
 
 if [ $testsuite_only -eq 0 ]; then
 
 if [ $no_clean -eq 0 ]; then
-    make maintainer-clean NO_CLEAN_GMP=YES
+    $make maintainer-clean NO_CLEAN_GMP=YES
 
     INSTDIR=`pwd`/inst
     if [ "$OSTYPE" = "cygwin" ]
     then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
-    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
-            if [ -f c:/mingw/bin/ld.exe ]
-            then
-                config_args="$config_args --with-ld=c:/mingw/bin/ld"
-            fi
-            ;;
-    esac
 
-    sh boot
+    /usr/bin/perl -w boot
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
@@ -82,7 +81,11 @@ thisdir=`utils/ghc-pwd/ghc-pwd`
 
 echo "Validating=YES" > mk/are-validating.mk
 
-make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+$make binary-dist-prep
+$make test_bindist TEST_PREP=YES
+
 fi # testsuite-only
 
 if [ "$hpc" = YES ]
@@ -95,7 +98,7 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+$make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then