diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-05-17 20:06:54 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-05-17 20:06:54 +0000 |
| commit | 619f6709b307d9b51e7aae94d3d564a438282fe9 (patch) | |
| tree | a33213eee1de50837ca9fbed7f68f60bc4ef25a0 | |
| parent | 7a88e2da8f9cce37f7d2b6af2f4b5a2a9c97bcb2 (diff) | |
| download | haskell-619f6709b307d9b51e7aae94d3d564a438282fe9.tar.gz | |
In validate, use gmake if available; based on a patch from Gabor PALI
| -rw-r--r-- | validate | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -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 |