diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mk/custom-settings.mk | 2 | ||||
| -rw-r--r-- | validate | 6 |
3 files changed, 7 insertions, 3 deletions
@@ -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 diff --git a/mk/custom-settings.mk b/mk/custom-settings.mk index db8ebb4451..1a01873d31 100644 --- a/mk/custom-settings.mk +++ b/mk/custom-settings.mk @@ -1,4 +1,6 @@ +-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 |