0.8alpha.0.20:

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

diff --git a/make-host-2.sh b/make-host-2.sh
index e3c4f3f..c359595 100644 (file)
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -55,20 +55,25 @@ $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)))))
         (compile 'proclaim-target-optimization)
-       (defun in-target-cross-compilation-mode (fn)
-         "Call FN with everything set up appropriately for cross-compiling
+       (defun in-target-cross-compilation-mode (fun)
+         "Call FUN with everything set up appropriately for cross-compiling
          a target file."
          (let (;; In order to increase microefficiency of the target Lisp, 
                ;; enable old CMU CL defined-function-types-never-change
@@ -90,10 +95,10 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
             (proclaim-target-optimization)
             ;; Specify where target machinery lives.
             (with-additional-nickname ("SB-XC" "SB!XC")
-              (funcall fn))))
+              (funcall fun))))
        (compile 'in-target-cross-compilation-mode)
-       (setf *target-compile-file* 'sb-xc:compile-file)
-       (setf *target-assemble-file* 'sb!c:assemble-file)
+       (setf *target-compile-file* #'sb-xc:compile-file)
+       (setf *target-assemble-file* #'sb!c:assemble-file)
        (setf *in-target-compilation-mode-fn*
              #'in-target-cross-compilation-mode)
 
@@ -107,7 +112,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 +127,10 @@ $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)
        EOF
 
 # Run GENESIS (again) in order to create cold-sbcl.core. (The first