0.8.5.15:

[sbcl.git] / make.sh

diff --git a/make.sh b/make.sh
index 64a565b..776e97b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -62,24 +62,8 @@ SBCL_XC_HOST="${1:-sbcl --noprogrammer}"
 export SBCL_XC_HOST
 echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"
 
-# the GNU dialect of "make" -- easier to find or port it than to
-# try to figure out how to port to the local dialect...
-if [ "$GNUMAKE" != "" ] ; then
-  # The user is evidently trying to tell us something.
-  GNUMAKE="$GNUMAKE"
-elif [ -x "`which gmake`" ] ; then
-  # "gmake" is the preferred name in *BSD.
-  GNUMAKE=gmake
-elif [ "GNU Make" = "`make -v | head -n 1 | cut -b 0-8`" ]; then
-  GNUMAKE=make
-else
-  echo "GNU Make not found. Try setting the environment variable GNUMAKE."
-  exit 1
-fi
-
-export GNUMAKE
-echo //GNUMAKE=\"$GNUMAKE\"
-
+. ./find-gnumake.sh
+find_gnumake
 
 # If you're cross-compiling, you should probably just walk through the
 # make-config.sh script by hand doing the right thing on both the host
@@ -113,9 +97,22 @@ sh make-config.sh || exit 1
 # Or, if you can set up the files somewhere shared (with NFS, AFS, or
 # whatever) between the host machine and the target machine, the basic
 # procedure above should still work, but you can skip the "copy" steps.
-time sh make-host-1.sh   || exit 1
-time sh make-target-1.sh || exit 1
-time sh make-host-2.sh   || exit 1
-time sh make-target-2.sh || exit 1
-time sh make-target-contrib.sh || exit 1
+sh make-host-1.sh   || exit 1
+sh make-target-1.sh || exit 1
+sh make-host-2.sh   || exit 1
+sh make-target-2.sh || exit 1
+sh make-target-contrib.sh || exit 1
+
+# Sometimes people used to see the "No tests failed." output from the last
+# DEFTEST in contrib self-tests and think that's all that is. So...
+NCONTRIBS=`find contrib -name Makefile -print | wc -l`
+NPASSED=`find contrib -name test-passed -print | wc -l`
+
+echo
+echo The build seems to have finished successfully, including $NPASSED
+echo (out of $NCONTRIBS) contributed modules.  If you would like to run 
+echo more extensive tests on the new SBCL, you can try 
+echo "  cd tests && sh ./run-tests.sh"
+echo "(but expect some failures on non-x86 platforms)."
+
 date