X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-host-1.sh;h=94e301977a43543dd72012e353732fa12d77cd09;hb=HEAD;hp=7b550310fd36421775f6011e2bfc04d546e3f232;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/make-host-1.sh b/make-host-1.sh
index 7b55031..94e3019 100644
--- a/make-host-1.sh
+++ b/make-host-1.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-host-1.sh
 
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
+
+# Load our build configuration
+. output/build-config
+
 # Compile and load the cross-compiler. (We load it here not because we're
 # about to use it, but because it's written under the assumption that each
 # file will be loaded before the following file is compiled.)
@@ -23,20 +31,4 @@ echo //entering make-host-1.sh
 # header file sbcl.h which will be needed to create the C runtime
 # environment.
 echo //building cross-compiler, and doing first genesis
-$SBCL_XC_HOST <<-'EOF' || exit 1
-	;; (We want to have some limit on print length and print level
-	;; during bootstrapping because PRINT-OBJECT only gets set
-	;; up rather late, and running without PRINT-OBJECT it's easy
-	;; to fall into printing enormous (or infinitely circular)
-	;; low-level representations of things.)
-	(setf *print-level* 5 *print-length* 5)
-	(load "src/cold/shared.lisp")
-	(in-package "SB-COLD")
-	(setf *host-obj-prefix* "obj/from-host/")
-	(load "src/cold/shared.lisp")
-	(load "src/cold/set-up-cold-packages.lisp")
-	(load "src/cold/defun-load-or-cload-xcompiler.lisp")
-	(load-or-cload-xcompiler #'host-cload-stem)
-        (host-cload-stem "compiler/generic/genesis")
-	(sb!vm:genesis :c-header-file-name "src/runtime/sbcl.h")
-	EOF
+$SBCL_XC_HOST < make-host-1.lisp || exit 1