X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-2.sh;h=783d442f7d03d431a90b9777d7515407abba607b;hb=fbde18e9b7d8e67e24f628638be4f293cb128101;hp=4431c6097d18059ad2935148c8977c67aee46528;hpb=31361af9eb64344f521abbb245ea784c76c746e5;p=sbcl.git

diff --git a/make-target-2.sh b/make-target-2.sh
index 4431c60..783d442 100644
--- a/make-target-2.sh
+++ b/make-target-2.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # This is a script to be run as part of make.sh. The only time you'd
 # want to run it by itself is if you're trying to cross-compile the
@@ -15,6 +16,10 @@
 
 echo //entering make-target-2.sh
 
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
+
 # Do warm init stuff, e.g. building and loading CLOS, and stuff which
 # can't be done until CLOS is running.
 #
@@ -27,32 +32,69 @@ echo //entering make-target-2.sh
 echo //doing warm init
 ./src/runtime/sbcl \
 --core output/cold-sbcl.core \
---sysinit /dev/null --userinit /dev/null <<-'EOF' || exit 1
+--sysinit /dev/null --userinit /dev/null <<-'EOF'
+	;; Now that we use the compiler for macros, interpreted
+	;; /SHOW doesn't work until later in init.
+        #+sb-show (print "/hello, world!")
 
-        (sb!int:/show "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
 	;; 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 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)
-	(sb-ext:save-lisp-and-die "output/sbcl.core" :purify t)
+        ;; The system is complete now, all standard functions are
+        ;; defined.
+        (sb-kernel::ctype-of-cache-clear)
+        (setq sb-c::*flame-on-necessarily-undefined-function* t)
+	(sb-ext:save-lisp-and-die "output/sbcl.core")
 	EOF