0.7.10.18:

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

diff --git a/make-host-2.sh b/make-host-2.sh
index 637914a..e266d77 100644 (file)
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -67,8 +67,8 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
                                        (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
@@ -76,8 +76,6 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
                ;; redefine our functions anyway; and developers can
                ;; fend for themselves.)
                #!-sb-fluid (sb!ext:*derive-function-types* t)
-               ;; FIXME: *TOPLEVEL-LAMBDA-MAX* should go away altogether.
-               (sb!c::*toplevel-lambda-max* 1)
                ;; Let the target know that we're the cross-compiler.
                (*features* (cons :sb-xc *features*))
                ;; We need to tweak the readtable..
@@ -92,10 +90,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)
 
@@ -125,6 +123,7 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
           #+cmu (ext:save-lisp "output/after-xc.core" :load-init-file nil)
           #+sbcl (sb-ext:save-lisp-and-die "output/after-xc.core")
          )
+        #+cmu (ext:quit)
        EOF
 
 # Run GENESIS (again) in order to create cold-sbcl.core. (The first