X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make-host-2.sh;h=bb6af7505cfef1a2c8515ab4b696d490afada720;hb=4cf50b1896b25f5337e7c258b0b560da00d47993;hp=cecfa18d167c372e569046d739750cf28beb13c8;hpb=ce02ab2ecd9c6ae2e570abd8c93ebf3be55bbdad;p=sbcl.git

diff --git a/make-host-2.sh b/make-host-2.sh
index cecfa18..bb6af75 100644
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -64,22 +64,6 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
 		(sb!c::*top-level-lambda-max* 10)
 		;; Let the target know that we're the cross-compiler.
 		(*features* (cons :sb-xc *features*))
-		;; the CROSS-FLOAT-INFINITY-KLUDGE: When building a
-		;; compiler which runs under the SBCL runtime, which
-		;; supports floating point infinities, it's safe to
-		;; build with true PROPAGATE-FLOAT-TYPE and
-		;; PROPAGATE-FUN-TYPE features. (It wasn't safe
-		;; when building a cross-compiler to run under the
-		;; cross-compilation host Lisp).
-		#+nil ; FIXME: suppressed since 0.6.11.3 has no fp infinities
-		(sb-cold:*shebang-features*
-		 (substitute
-		  :propagate-float-type
-		  :will-propagate-float-type
-		  (substitute
-		   :propagate-fun-type
-		   :will-propagate-fun-type
-		   sb-cold:*shebang-features*)))
 		;; We need to tweak the readtable..
 		(*readtable* (copy-readtable)))
             ;; ..in order to make backquotes expand into target code
@@ -106,7 +90,8 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
         ;; Let's check that the type system was reasonably sane. (It's
 	;; easy to spend a long time wandering around confused trying
 	;; to debug cold init if it wasn't.)
-	(load "tests/type.after-xc.lisp")
+	(when (find :sb-test *shebang-features*)
+	  (load "tests/type.after-xc.lisp"))
 	;; If you're experimenting with the system under a
         ;; cross-compilation host which supports CMU-CL-style SAVE-LISP,
         ;; this can be a good time to run it. The resulting core isn't
@@ -146,7 +131,7 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
 	  (with-open-file (s "output/object-filenames-for-genesis.lisp-expr"
 	                     :direction :input)
 	    (read s)))
-	(host-load-stem "compiler/generic/genesis")
+	(host-load-stem "src/compiler/generic/genesis")
 	(sb!vm:genesis :object-file-names *target-object-file-names*
 		       :c-header-file-name "output/sbcl2.h"
 		       :symbol-table-file-name "src/runtime/sbcl.nm"