X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=8f70811e411b93029afdd168af23599eb240e2f8;hp=7949d6299fe04366d1a8cf8e37706ee67cdf1766;hb=0b9530245a33b8206ca38b9de6dfb01e056fd8dc;hpb=2924c4bc8e4a433c1816695d22319b63a328b418 diff --git a/validate b/validate index 7949d62..8f70811 100644 --- a/validate +++ b/validate @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if [ -f mk/config.mk ]; then make distclean @@ -9,8 +11,9 @@ if [ -f mk/build.mk ]; then fi # The default is a "quick" build -echo BuildFlavour=quick >mk/build.mk -cat mk/build.mk.sample >>mk/build.mk +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. @@ -25,13 +28,9 @@ case $OSTYPE in esac if [ "$CPUS" = "" ]; then - # ToDo: make -j doesn't work in libraries/ on Windows (see #1559) - case $OSTYPE in - cygwin|msys) threads=1;; - *) threads=2;; - esac + threads=2 else - threads=`expr $CPUS + 1` + threads=`expr $CPUS + 1` fi sh boot