0.7.8.22:

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

diff --git a/make-target-2.sh b/make-target-2.sh
index 4431c60..bb0f113 100644 (file)
--- a/make-target-2.sh
+++ b/make-target-2.sh
@@ -29,18 +29,36 @@ echo //doing warm init
 --core output/cold-sbcl.core \
 --sysinit /dev/null --userinit /dev/null <<-'EOF' || exit 1
 
-        (sb!int:/show "hello, world!")
+       ;; Now that we use the compiler for macros, interpreted
+       ;; /SHOW doesn't work until later in init.
+        #+sb-show (print "/hello, world!")
+
+        ;; Until PRINT-OBJECT and other machinery is set up,
+       ;; we want limits on printing to avoid infinite output.
+       ;; (Don't forget to undo these tweaks after the printer
+       ;; is set up. It'd be cleaner to use LET to make sure 
+       ;; that happens automatically, but LET is implemented
+       ;; in terms of the compiler, and the compiler isn't 
+        ;; initialized yet.)
+        (setq *print-length* 10)
+       (setq *print-level* 5)
+        (setq *print-circle* t)
 
         ;; Do warm init.
-       (let ((*print-length* 10)
-             (*print-level* 10))
-          (sb!int:/show "about to LOAD warm.lisp")
-         (load "src/cold/warm.lisp"))
+        #+sb-show (print "/about to LOAD warm.lisp")
+       (load "src/cold/warm.lisp")
 
         ;; Unintern no-longer-needed stuff before the possible PURIFY
         ;; in SAVE-LISP-AND-DIE.
         #-sb-fluid (sb-impl::!unintern-init-only-stuff)
 
+        ;; Now that the whole system is built, we don't need to 
+        ;; hobble the printer any more, so we can restore printer 
+       ;; control variables to their ANSI defaults.
+        (setq *print-length* nil)
+       (setq *print-level* nil)
+        (setq *print-circle* nil)
+
        ;; FIXME: Why is it that, at least on x86 sbcl-0.6.12.46,
        ;; GC :FULL T isn't nearly as effective as PURIFY here?
        ;; (GC :FULL T gets us down to about 38 Mbytes, but PURIFY