From: Taylor R Campbell <campbell@mumble.net>
Date: Tue, 11 Dec 2018 15:55:42 +0000 (+0000)
Subject: Do all-compiler/sf/cref only in cross-host, not in cross-target.
X-Git-Tag: mit-scheme-pucked-10.1.9~3^2~35^2~40
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=a6602e423af17882168578b833c3b7e9839a0514;p=mit-scheme.git

Do all-compiler/sf/cref only in cross-host, not in cross-target.

In the cross-compiled system when doing cross-target, which depends
on runtime.com and all.com, the dependencies of runtime.com and
all.com were already made by cross-host.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 6f428af8a..b65fac611 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -179,7 +179,7 @@ microcode/svm1-defns.h: compiler/machines/svm/svm1-defns.h
 ################
 
 lib/runtime.com: microcode/scheme
-lib/runtime.com: all-runtime
+@IF_NATIVE@lib/runtime.com: all-runtime
 @IF_CROSS@lib/runtime.com: stamp_cross-finished
 	(. etc/functions.sh && get_fasl_file && cd runtime \
 	  && (echo '(disk-save "../$@")' \
@@ -187,9 +187,9 @@ lib/runtime.com: all-runtime
 
 lib/all.com: microcode/scheme
 lib/all.com: lib/runtime.com
-lib/all.com: all-compiler
-lib/all.com: all-sf
-lib/all.com: all-cref
+@IF_NATIVE@lib/all.com: all-compiler
+@IF_NATIVE@lib/all.com: all-sf
+@IF_NATIVE@lib/all.com: all-cref
 @IF_CROSS@lib/all.com: stamp_cross-finished
 	(echo '(begin' && \
 	 echo '  (load-option (quote compiler))' && \
diff --git a/src/configure.ac b/src/configure.ac
index c2cdb77e3..fd9591eb7 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -69,8 +69,10 @@ AC_ARG_ENABLE([cross-compiling],
 : ${enable_cross_compiling=no}
 if test "x${enable_cross_compiling}" = xyes; then
     IF_CROSS=
+    IF_NATIVE='#!native: '
 else
     IF_CROSS='#!cross-compiling: '
+    IF_NATIVE=
 fi
 
 AC_ARG_WITH([default-target],
@@ -374,6 +376,7 @@ AC_SUBST([IF_GDBM])
 AC_SUBST([IF_IMAIL])
 AC_SUBST([IF_LIARC])
 AC_SUBST([IF_MCRYPT])
+AC_SUBST([IF_NATIVE])
 AC_SUBST([IF_PGSQL])
 AC_SUBST([IF_SVM])
 AC_SUBST([IF_SVM_COMPILER])