X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-2.sh;h=fd1071084c2ecaf59fc0df0f705cf3b511e313b4;hb=HEAD;hp=a5ee9faf7bd038ae4afc0cf710ab08188588fdf5;hpb=cd13034f9415f64cdaa05893a4ac5ff1e95c97bd;p=sbcl.git

diff --git a/make-target-2.sh b/make-target-2.sh
index a5ee9fa..fd10710 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,13 @@
 
 echo //entering make-target-2.sh
 
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
+
+# Load our build configuration
+. output/build-config
+
 # Do warm init stuff, e.g. building and loading CLOS, and stuff which
 # can't be done until CLOS is running.
 #
@@ -24,68 +32,13 @@ echo //entering make-target-2.sh
 # system with the :SB-SHOW feature enabled, it does it rather silently,
 # without trying to tell you about what it's doing. So unless it hangs
 # for much longer than that, don't worry, it's likely to be normal.
-echo //doing warm init
+echo //doing warm init - compilation phase
 ./src/runtime/sbcl \
 --core output/cold-sbcl.core \
---sysinit /dev/null --userinit /dev/null <<-'EOF' || exit 1
-
-	;; 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.
-        #+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")
-	(sb-c::pack-before-gc-hook) ; KLUDGE
-	(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)))
-
-        (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)
-        ;; 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
+--lose-on-corruption \
+--no-sysinit --no-userinit < make-target-2.lisp
+echo //doing warm init - load and dump phase
+./src/runtime/sbcl \
+--core output/cold-sbcl.core \
+--lose-on-corruption \
+--no-sysinit --no-userinit < make-target-2-load.lisp