X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-2.sh;h=bb0f11379470091300f45fb72daaf7d124c630ae;hb=e1ba5a0d68ff8d4c8e688cd6a951aea1d56b1b61;hp=16f1e9cc41e7eb538caa2f479a79d7baa42324d3;hpb=6d9ecc45cb21a1208deb8c4d128adc04aa289c9d;p=sbcl.git

diff --git a/make-target-2.sh b/make-target-2.sh
index 16f1e9c..bb0f113 100644
--- a/make-target-2.sh
+++ b/make-target-2.sh
@@ -13,7 +13,7 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-echo //entering make-host-2.sh
+echo //entering make-target-2.sh
 
 # Do warm init stuff, e.g. building and loading CLOS, and stuff which
 # can't be done until CLOS is running.
@@ -28,11 +28,45 @@ echo //doing warm init
 ./src/runtime/sbcl \
 --core output/cold-sbcl.core \
 --sysinit /dev/null --userinit /dev/null <<-'EOF' || exit 1
-        (sb!int:/show "hello, world!")
-	(let ((*print-length* 5)
-	      (*print-level* 5))
-          (sb!int:/show "about to LOAD warm.lisp")
-	  (load "src/cold/warm.lisp"))
+
+	;; 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.
+        #+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
+	;; gets us down to about 19 Mbytes.)
+	(let ((*gc-notify-stream* *standard-output*))
+	  (sb-int:/show "done with warm.lisp, about to GC :FULL T")
+	  (gc :full t))
+
         (sb-int:/show "done with warm.lisp, about to SAVE-LISP-AND-DIE")
 	;; Even if /SHOW output was wanted during build, it's probably
 	;; not wanted by default after build is complete. (And if it's