Commit 6594f91c authored by Ian Lynagh's avatar Ian Lynagh

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.
parent 5d82b8a5
......@@ -595,7 +595,7 @@ DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
docs/users_guide/ug-book.xml extra-gcc-opts
# don't clean config.mk: it's needed when cleaning stuff later on
LATE_DIST_CLEAN_FILES += mk/config.mk
LATE_DIST_CLEAN_FILES += mk/config.mk mk/are-validating.mk
# VERSION is shipped in a source dist
MAINTAINER_CLEAN_FILES += VERSION
......
-include $(TOP)/mk/are-validating.mk
ifeq "$(Validating)" "YES"
include $(TOP)/mk/validate-settings.mk
-include $(TOP)/mk/validate.mk
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment