0.9.7.13:

[sbcl.git] / make-host-2.sh

diff --git a/make-host-2.sh b/make-host-2.sh
index e266d77..0321ad3 100644 (file)
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # This is a script to be run as part of make.sh. The only time you'd
 # want to run it by itself is if you're trying to cross-compile the
@@ -15,6 +16,10 @@
 
 echo //entering make-host-2.sh
 
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
+
 # In some cases, a debugging build of the system will creates a core
 # file output/after-xc.core in the next step. In cases where it
 # doesn't, it's confusing and basically useless to have any old copies
@@ -40,7 +45,7 @@ rm -f output/after-xc.core
 # the fasl files into the new host Lisp, and that doesn't seem to be
 # an enormously important disadvantage, either.)
 echo //running cross-compiler to create target object files
-$SBCL_XC_HOST <<-'EOF' || exit 1
+$SBCL_XC_HOST <<-'EOF'
 
         ;;;
         ;;; Set up the cross-compiler.
@@ -55,17 +60,24 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
        (load-or-cload-xcompiler #'host-load-stem)
         (defun proclaim-target-optimization ()
           (let ((debug (if (position :sb-show *shebang-features*) 2 1)))
-           (sb-xc:proclaim `(optimize (compilation-speed 1)
-                                      (debug ,debug)
-                                      (sb!ext:inhibit-warnings 2)
-                                      ;; SAFETY = SPEED (and < 3) should 
-                                      ;; reasonable safety, but might skip 
-                                      ;; some unreasonably expensive stuff
-                                      ;; (e.g. %DETECT-STACK-EXHAUSTION
-                                      ;; in sbcl-0.7.2).
-                                       (safety 2)
-                                       (space 1)
-                                      (speed 2)))))
+           (sb-xc:proclaim 
+             `(optimize
+              (compilation-speed 1)
+              (debug ,debug)
+              ;; CLISP's pretty-printer is fragile and tends to cause
+              ;; stack corruption or fail internal assertions, as of
+              ;; 2003-04-20; we therefore turn off as many notes as
+              ;; possible.
+              (sb!ext:inhibit-warnings #-clisp 2
+                                       #+clisp 3)
+              ;; SAFETY = SPEED (and < 3) should provide reasonable
+              ;; safety, but might skip some unreasonably expensive
+              ;; stuff (e.g. %DETECT-STACK-EXHAUSTION in sbcl-0.7.2).
+              (safety 2)
+              (space 1)
+              (speed 2)
+               (sb!c:insert-step-conditions 0)
+               (sb!c::stack-allocate-dynamic-extent 3)))))
         (compile 'proclaim-target-optimization)
        (defun in-target-cross-compilation-mode (fun)
          "Call FUN with everything set up appropriately for cross-compiling
@@ -107,7 +119,7 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
         ;;; 
        (let ((filename "output/object-filenames-for-genesis.lisp-expr"))
          (ensure-directories-exist filename :verbose t)
-         (with-open-file (s filename :direction :output)
+         (with-open-file (s filename :direction :output :if-exists :supersede)
            (write *target-object-file-names* :stream s :readably t)))
         ;; Let's check that the type system was reasonably sane. (It's
        ;; easy to spend a long time wandering around confused trying
@@ -122,8 +134,11 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
        (when (position :sb-after-xc-core *shebang-features*)
           #+cmu (ext:save-lisp "output/after-xc.core" :load-init-file nil)
           #+sbcl (sb-ext:save-lisp-and-die "output/after-xc.core")
-         )
+          #+openmcl (ccl::save-application "output/after-xc.core")
+          #+clisp (ext:saveinitmem "output/after-xc.core"))
         #+cmu (ext:quit)
+        #+clisp (ext:quit)
+        #+abcl (ext:quit)
        EOF
 
 # Run GENESIS (again) in order to create cold-sbcl.core. (The first