X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=876dabb66131da5220e94ace55a604e7a762c481;hp=9ab5e0d9705d0b43c66eeefc7ea59e168028e128;hb=aafdba3bce91afb003f5f50e001e141744837bae;hpb=29d909009d47c52c5f02630658f7422c634230ab

diff --git a/validate b/validate
index 9ab5e0d..876dabb 100644
--- a/validate
+++ b/validate
@@ -6,19 +6,6 @@ if [ -f mk/config.mk ]; then
    make distclean
 fi
 
-if [ -f mk/build.mk ]; then
-   mv mk/build.mk mk/build.mk.bak
-fi
-
-# The default is a "quick" build
-echo BuildFlavour=quick >  mk/build.mk
-echo HADDOCK_DOCS=YES   >> mk/build.mk
-cat mk/build.mk.sample  >> mk/build.mk
-
-# You can override the default validate settings using mk/validate.mk
-# e.g. you could add GhcLibWays=p to test profiling.
-echo '-include $(TOP)/mk/validate.mk' >>mk/build.mk
-
 case $OSTYPE in
   cygwin|msys) config_args=--build=i386-unknown-mingw32
                if [ -f c:/mingw/bin/gcc.exe ]; then
@@ -36,10 +23,10 @@ fi
 sh boot
 ./configure $config_args
 
-make -j$threads
+make Validating=YES -j$threads
 
 # ToDo: use THREADS=$threads, see #1558
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
+make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
 
 if
     grep '\<0 caused framework failures' testlog >/dev/null 2>/dev/null &&