X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=d6f1c15b357cfe14d884053d72163eda95e86035;hb=619efa4035d215c16ea657f2b038362c87b769fc;hp=c20296464419691528216fe10fa7b8fe9e203e6a;hpb=ea195ee0a74836f2692a96c450240c1caaf75e4c;p=ghc-hetmet.git

diff --git a/validate b/validate
index c202964..d6f1c15 100644
--- 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