0.9.6.48: more stability

[sbcl.git] / slam.sh

diff --git a/slam.sh b/slam.sh
index 457ebf8..cb86e73 100644 (file)
--- a/slam.sh
+++ b/slam.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # a quick and dirty way of partially rebuilding the system after a
 # change
@@ -82,22 +83,35 @@ case "$HOST_TYPE" in
            INIT="--sysinit /dev/null --userinit /dev/null"
            CORE="--core"
            ;;
+    clisp) LISP="clisp"
+           INIT="-norc"
+           CORE="-M"
+           ;;
+    openmcl)
+           LISP="openmcl"
+          INIT="-b"
+          CORE="-I"
+          ;;
     *)     echo unknown host type: "$HOST_TYPE"
-           echo should be one of "sbcl" or "cmucl"
+           echo should be one of "sbcl", "cmucl", or "clisp"
            exit 1
 esac
 
-export SBCL_XC_HOST="$LISP $INIT"
+SBCL_XC_HOST="$LISP $INIT"
+export SBCL_XC_HOST
 
 # (We don't do make-host-1.sh at all. Hopefully nothing relevant has
 # changed.)
 
-sh make-target-1.sh || exit 1
+. ./find-gnumake.sh
+find_gnumake
+
+sh make-target-1.sh
 
 # Instead of doing the full make-host-2.sh, we (1) use after-xc.core
 # to rebuild only obviously-out-of-date Lisp files, then (2) run
 # GENESIS.
-$LISP $CORE output/after-xc.core $INIT <<'EOF' || exit 1
+$LISP $CORE output/after-xc.core $INIT <<'EOF'
   (load "src/cold/slam.lisp")
 EOF
 # (This ^ used to be
@@ -107,9 +121,9 @@ EOF
 # rebuild-this-stem requests on the command line to supplement
 # the rebuild-obviously-outdated-stems logic above.)
 #
-sh make-genesis-2.sh || exit 1 
+sh make-genesis-2.sh
 
-sh make-target-2.sh || exit 1
+sh make-target-2.sh
 
 echo //ordinary termination of slam.sh
 date