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

diff --git a/make-target-2.sh b/make-target-2.sh
index 3d7990f..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
@@ -13,7 +14,14 @@
 # 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
+
+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,19 +32,13 @@ echo //entering make-host-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 \
+--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 \
---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"))
-        (sb-int:/show "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)
-	EOF
+--lose-on-corruption \
+--no-sysinit --no-userinit < make-target-2-load.lisp