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 889e2fed2a90984b40ed79cd7e607b0a0e61f2bd..85bfbbd81ed01837c751eca70245c86ff84e65e4 100755 (executable)
--- 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 b5c9bf602b5942a0e750dfc5d2396b0c2c4db8e2..3692d94110989828ffb3cbe46e396fafd1e44f35 100755 (executable)
--- 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 ae4f300bc63e7235ddcdb3570b310ee6997cbba8..e8312cd00eef6f739a3a5008631531799c28fad3 100755 (executable)
--- 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