Do all-compiler/sf/cref only in cross-host, not in cross-target.
authorTaylor R Campbell <campbell@mumble.net>
Tue, 11 Dec 2018 15:55:42 +0000 (15:55 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Tue, 11 Dec 2018 16:00:08 +0000 (16:00 +0000)
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.

src/Makefile.in
src/configure.ac

index 6f428af8aab82c74267965fc1ad10a95818ec530..b65fac611653b48eb7639abc454fb9a93e391dda 100644 (file)
@@ -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))' && \
index c2cdb77e3abac634aed87f6eac4cbb54694972c2..fd9591eb771a940a3eee4ff6b4ccbaae06b59653 100644 (file)
@@ -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])