summaryrefslogtreecommitdiff
path: root/validate
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-08-17 12:33:11 +0000
committerIan Lynagh <igloo@earth.li>2008-08-17 12:33:11 +0000
commit6594f91c25da7d5becc90d73adfdabf922cc67da (patch)
treee6dd57b1b557b577f181c811dc17c93fc0fc13d1 /validate
parent5d82b8a5f6bedb0f62727e5dde90cef054edba1e (diff)
downloadhaskell-6594f91c25da7d5becc90d73adfdabf922cc67da.tar.gz
Change how we know whether or not we are validating
We now set Validating=YES in mk/are-validating.mk rather than on the commandline. This means that if you build a tree with validate then just running make in it will use the validate flags. "make distclean" removes mk/are-validating.mk, putting us back in standard build mode.
Diffstat (limited to 'validate')
-rw-r--r--validate6
1 files changed, 4 insertions, 2 deletions
diff --git a/validate b/validate
index 31900a1654..d6f1c15b35 100644
--- a/validate
+++ b/validate
@@ -73,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 ]
@@ -86,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