X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=741daacecb2b02fc666afbbf7ae74ce698d0a147;hp=889daae03ea2b3c4d527f6c87c6d59e8e3d02b5a;hb=fc5cd848af22c97dfde1953b9efcfc60e6ccf2bb;hpb=541889e7615289bfc476348a6362426d6a31c444

diff --git a/validate b/validate
index 889daae..741daac 100644
--- a/validate
+++ b/validate
@@ -54,27 +54,13 @@ fi
 if [ $testsuite_only -eq 0 ]; then
 
 if [ $no_clean -eq 0 ]; then
-    if [ -f mk/config.mk ]; then
-        make maintainer-clean
-    fi
+    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
     ./configure --prefix="$INSTDIR" $config_args
@@ -85,6 +71,10 @@ thisdir=`utils/ghc-pwd/ghc-pwd`
 echo "Validating=YES" > mk/are-validating.mk
 
 make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+make binary-dist-prep
+make -C bindisttest TEST_PREP=YES
+
 fi # testsuite-only
 
 if [ "$hpc" = YES ]
@@ -97,7 +87,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
@@ -128,6 +118,9 @@ WARNING: You seem to have things set in mk/validate.mk. Please check
 that it is OK before pushing.
 EOF
         fi
+        cat <<EOF
+-------------------------------------------------------------------
+EOF
     else
         cat <<EOF
 I didn't find any problems, but this wasn't a complete validate run,