X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make.sh;h=20c03de3e645d0532fcaa2da85aac1fc5e94c953;hb=80f222325e1f677e5cf8de01c6990906fa47f65d;hp=b3b47fa6f4ba385c3dc4484cd94bceefb01dc603;hpb=df679ed627975948b1cee190f4d79c397588c43e;p=sbcl.git

diff --git a/make.sh b/make.sh
index b3b47fa..20c03de 100755
--- a/make.sh
+++ b/make.sh
@@ -58,32 +58,16 @@
 # But in a year or so the --noprogrammer here can change to
 # --disable-debugger (and the deprecated --noprogrammer support can
 # go away completely).
+
+build_started=`date`
+echo "//starting build: $build_started"
+
 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
-else
-  # FIXME: Now that we do this early, maybe prompt the user rather
-  # than guessing?  I'd still be annoyed, though... -- CSR,
-  # 2003-05-16.
-  #
-  # All the world's a Linux, and all its users weary of cautious
-  # BSDish worries that "make" might not be GNU make; so just guess
-  # that "make" is GNU make and hope for the best.
-  GNUMAKE=make
-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
@@ -117,9 +101,25 @@ 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.
-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
-date
+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
+
+# 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)."
+
+build_finished=`date`
+echo
+echo "//build started:  $build_started"
+echo "//build finished: $build_finished"