X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-2.sh;h=783d442f7d03d431a90b9777d7515407abba607b;hb=d6d76c98535bddabd73c6338f8393b6e698f297f;hp=507ddf097df45a3717c3fd070cfcbde58cfe8837;hpb=a237d7e039a923e109a4eefbd4e6a563a2ba0521;p=sbcl.git

diff --git a/make-target-2.sh b/make-target-2.sh
index 507ddf0..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,12 +32,10 @@ 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!ext:purify)
 
         ;; Until PRINT-OBJECT and other machinery is set up,
 	;; we want limits on printing to avoid infinite output.
@@ -64,9 +67,8 @@ echo //doing warm init
 	;; 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
@@ -79,6 +81,12 @@ echo //doing warm init
 		             (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
@@ -86,6 +94,7 @@ echo //doing warm init
 	#+sb-show (setf sb-int:*/show* nil)
         ;; 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" :purify t)
+	(sb-ext:save-lisp-and-die "output/sbcl.core")
 	EOF