X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-2.sh;h=6b3cd21aafe7e4ea17ae511adfbc45c5af731ce6;hb=d0511d2a94e7d2d346e2f4acc38ff84cd99a74b1;hp=03d53aaf4f5f420bb80775f70be1244869183dbb;hpb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;p=sbcl.git

diff --git a/make-target-2.sh b/make-target-2.sh
index 03d53aa..6b3cd21 100644
--- a/make-target-2.sh
+++ b/make-target-2.sh
@@ -29,25 +29,68 @@ 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!")
+        (sb!ext:purify)
+
+        ;; 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* 5)
-	      (*print-level* 5))
-          (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
+	;; gets us down to about 19 Mbytes.)
+	(sb-int:/show "done with warm.lisp, about to GC :FULL T")
+	(gc :full t)
+
+        ;; resetting compilation policy to neutral values in
+        ;; preparation for SAVE-LISP-AND-DIE as final SBCL core (not
+        ;; in warm.lisp because SB-C::*POLICY* has file scope)
+        (sb-int:/show "setting compilation policy to neutral values")
+        (proclaim '(optimize (compilation-speed 1)
+		             (debug 1)
+		             (inhibit-warnings 1)
+		             (safety 1)
+		             (space 1)
+		             (speed 1)))
+
+        ;; Lock internal packages
+        #+sb-package-locks
+        (dolist (p (list-all-packages))
+          (unless (member p (mapcar #'find-package '(:keyword :cl-user)))
+             (lock-package p)))
+
         (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
 	;; wanted, it can easily be turned back on.)
 	#+sb-show (setf sb-int:*/show* nil)
-        ;; REMOVEME: This is supposed to be :PURIFY T, the :PURIFY NIL
-	;; is a hopefully-very-short-lived workaround for a bug in
-	;; sbcl-0.6.12.8.
-	(sb-ext:save-lisp-and-die "output/sbcl.core" :purify nil)
+        ;; The system is complete now, all standard functions are
+        ;; defined.
+        (setq sb-c::*flame-on-necessarily-undefined-function* t)
+	(sb-ext:save-lisp-and-die "output/sbcl.core" :purify t)
 	EOF