Commit 619f6709 authored by Ian Lynagh's avatar Ian Lynagh

In validate, use gmake if available; based on a patch from Gabor PALI

parent 7a88e2da
......@@ -55,10 +55,17 @@ else
threads="$THREADS"
fi
if type gmake > /dev/null 2> /dev/null
then
make="gmake"
else
make="make"
fi
if [ $testsuite_only -eq 0 ]; then
if [ $no_clean -eq 0 ]; then
make maintainer-clean NO_CLEAN_GMP=YES
$make maintainer-clean NO_CLEAN_GMP=YES
INSTDIR=`pwd`/inst
if [ "$OSTYPE" = "cygwin" ]
......@@ -74,10 +81,10 @@ thisdir=`utils/ghc-pwd/ghc-pwd`
echo "Validating=YES" > mk/are-validating.mk
make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
make binary-dist-prep
make test_bindist TEST_PREP=YES
$make binary-dist-prep
$make test_bindist TEST_PREP=YES
fi # testsuite-only
......@@ -91,7 +98,7 @@ then
rm -f $HPCTIXFILE
fi
make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
$make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES 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