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

diff --git a/make-host-1.sh b/make-host-1.sh
index 3719026..94e3019 100644
--- a/make-host-1.sh
+++ b/make-host-1.sh
@@ -20,6 +20,9 @@ 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.)
@@ -28,33 +31,4 @@ export LANG LC_ALL
 # 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")
-	(load "tools-for-build/ldso-stubs.lisp")
-	(in-package "SB-COLD")
-	(setf *host-obj-prefix* "obj/from-host/")
-	(load "src/cold/set-up-cold-packages.lisp")
-	(load "src/cold/defun-load-or-cload-xcompiler.lisp")
-	(load-or-cload-xcompiler #'host-cload-stem)
-        ;; Let's check that the type system is reasonably sane. (It's
-	;; easy to spend a long time wandering around confused trying
-	;; to debug cross-compilation if it isn't.)
-	(when (find :sb-test *shebang-features*)
-	  (load "tests/type.before-xc.lisp")
-	  (load "tests/info.before-xc.lisp")
-	  (load "tests/vm.before-xc.lisp"))
-        (load "tools-for-build/ucd.lisp")
-        (sb-cold::slurp-ucd)
-        (sb-cold::output)
-        (host-cload-stem "src/compiler/generic/genesis")
-	(sb!vm:genesis :c-header-dir-name "src/runtime/genesis")
-        #+cmu (ext:quit)
-        #+clisp (ext:quit)
-        #+abcl (ext:quit)
-	EOF
+$SBCL_XC_HOST < make-host-1.lisp || exit 1