shift
done
-if [ "$CPUS" = "" ]; then
- threads=2
+if [ "$THREADS" = "" ]; then
+ if [ "$CPUS" = "" ]; then
+ threads=2
+ else
+ threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+ fi
else
- threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+ threads="$THREADS"
fi
if [ $testsuite_only -eq 0 ]; then
INSTDIR=`cygpath -m "$INSTDIR"`
fi
- sh boot
+ /usr/bin/perl -w boot
./configure --prefix="$INSTDIR" $config_args
fi
echo "Validating=YES" > mk/are-validating.mk
make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+make binary-dist-prep
+make -C bindisttest TEST_PREP=YES
+
fi # testsuite-only
if [ "$hpc" = YES ]
rm -f $HPCTIXFILE
fi
-make binary-dist-prep
-make -C bindisttest TEST_PREP=YES
-
-make -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 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
if [ "$hpc" = YES ]
then