Fix building with GHC 6.8

[ghc-hetmet.git] / validate

diff --git a/validate b/validate
index c202964..5d0afb4 100644 (file)
--- a/validate
+++ b/validate
@@ -53,8 +53,10 @@ fi
 
 if [ $testsuite_only -eq 0 ]; then
 
-if [ $no_clean -eq 0 ] && [ -f mk/config.mk ]; then
-    make distclean
+if [ $no_clean -eq 0 ]; then
+    if [ -f mk/config.mk ]; then
+        make distclean
+    fi
 
     case $OSTYPE in
         cygwin|msys) config_args=--build=i386-unknown-mingw32
@@ -71,7 +73,9 @@ fi
 
 thisdir=`utils/pwd/pwd forwardslash`
 
-make Validating=YES -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+echo "Validating=YES" > mk/are-validating.mk
+
+make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
 fi # testsuite-only
 
 if [ "$hpc" = YES ]
@@ -84,7 +88,7 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make Validating=YES -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 THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then
@@ -107,6 +111,14 @@ the minimal testing procedure, please do further testing as necessary.
 When you are satisfied that you haven't broken anything, go ahead and
 push/send your patches.
 EOF
+        if grep -q "^[^#]" mk/validate.mk
+        then
+            cat <<EOF
+
+WARNING: You seem to have things set in mk/validate.mk. Please check
+that it is OK before pushing.
+EOF
+        fi
     else
         cat <<EOF
 I didn't find any problems, but this wasn't a complete validate run,