From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Sun, 13 Oct 2013 07:44:16 +0000 (-0700)
Subject: Fix LIAR/C build to cross from 9.1.1.
X-Git-Tag: release-9.2.0~65
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=5cf6bfccc80cfa6b567a3bd18b0b9fa671ecbf1e;p=mit-scheme.git

Fix LIAR/C build to cross from 9.1.1.

Toss the .bins generated by the host runtime (which include
sequence-3).  Only cross-compile .bins generated by the cross runtime.
---

diff --git a/src/compiler/Stage.sh b/src/compiler/Stage.sh
index 889e2fed2..85bfbbd81 100755
--- a/src/compiler/Stage.sh
+++ b/src/compiler/Stage.sh
@@ -52,7 +52,23 @@ make-cross)
 	  maybe_mv *.com "$S"
 	  maybe_mv *.bci "$S"
 	  maybe_mv *.moc "$S"
-	  maybe_mv *.fni "$S" )
+	  maybe_mv *.fni "$S"
+	  maybe_mv *.lap "$S"
+	  maybe_mv *.rtl "$S" )
+    done
+    ;;
+make-clean)
+    for D in $SUBDIRS; do
+	( cd $D
+	  mkdir "$S"
+	  maybe_mv *.bin "$S"
+	  maybe_mv *.ext "$S"
+	  maybe_mv *.com "$S"
+	  maybe_mv *.bci "$S"
+	  maybe_mv *.moc "$S"
+	  maybe_mv *.fni "$S"
+	  maybe_mv *.lap "$S"
+	  maybe_mv *.rtl "$S" )
     done
     ;;
 unmake)
diff --git a/src/etc/Stage.sh b/src/etc/Stage.sh
index b5c9bf602..3692d9411 100755
--- a/src/etc/Stage.sh
+++ b/src/etc/Stage.sh
@@ -52,6 +52,17 @@ make-cross)
     maybe_mv *.lap "${DIRNAME}/."
     maybe_mv *.rtl "${DIRNAME}/."
     ;;
+make-clean)
+    mkdir "${DIRNAME}"
+    maybe_mv *.bin "${DIRNAME}/."
+    maybe_mv *.ext "${DIRNAME}/."
+    maybe_mv *.com "${DIRNAME}/."
+    maybe_mv *.bci "${DIRNAME}/."
+    maybe_mv *.moc "${DIRNAME}/."
+    maybe_mv *.fni "${DIRNAME}/."
+    maybe_mv *.lap "${DIRNAME}/."
+    maybe_mv *.rtl "${DIRNAME}/."
+    ;;
 unmake)
     if [ -d "${DIRNAME}" ]; then
 	maybe_mv "${DIRNAME}"/* .
diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index ae4f300bc..e8312cd00 100755
--- a/src/etc/compile-boot-compiler.sh
+++ b/src/etc/compile-boot-compiler.sh
@@ -70,5 +70,5 @@ run_cmd "${EXE}" --batch-mode --library lib --band x-runtime.com <<EOF
   (disk-save "lib/x-compiler.com"))
 EOF
 
-# Remove host (native) code to STAGEX/ subdirs.
-run_cmd ./Stage.sh make X
+# Remove host (native) code (.bins as well as .coms) to STAGEX/ subdirs.
+run_cmd ./Stage.sh make-clean X