Make sure that host-adapter causes rebuild of toolchain.

Also always load the .scm file since the compiled files may be out of date.

diff --git a/src/Makefile.in b/src/Makefile.in
index 6091dca86d1dfa616ff8bfd98729ceeee4e6b7dc..1341e656231ea0d76111b8559a598fda961b816f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -165,7 +165,7 @@ compiler/machines/svm/svm1-defns.h: \
          compiler/machines/svm/compile-assembler.scm
        ( cd compiler/machines/svm/ \
          && "$(MIT_SCHEME_EXE)" --batch-mode \
-               --load ../../../runtime/host-adapter \
+               --load ../../../runtime/host-adapter.scm \
                --load compile-assembler \
                </dev/null )
 

diff --git a/src/Makefile.tools.in b/src/Makefile.tools.in
index 23f09cc83fa61122181f025e1693a03f4e2a9202..843532e6828e61b3aab5d8093d65f8fd95e08e63 100644 (file)
--- a/src/Makefile.tools.in
+++ b/src/Makefile.tools.in
@@ -126,6 +126,7 @@ tools/compiler.com: cross-compiler
 tools/compiler.com: cross-cref
 tools/compiler.com: cross-sf
 tools/compiler.com: kludgerous-star-parser
+tools/compiler.com: runtime/host-adapter.scm
        (echo '(begin' && \
         echo '  (with-working-directory-pathname "cref"' && \
         echo '    (lambda () (load "make")))' && \
@@ -141,6 +142,7 @@ tools/compiler.com: kludgerous-star-parser
 tools/syntaxer.com: cross-cref
 tools/syntaxer.com: cross-sf
 tools/syntaxer.com: kludgerous-star-parser
+tools/syntaxer.com: runtime/host-adapter.scm
        (echo '(begin' && \
         echo '  (with-working-directory-pathname "cref"' && \
         echo '    (lambda () (load "make")))' && \

diff --git a/src/runtime/runtime.sf b/src/runtime/runtime.sf
index 804ac3a3f2bc06f708a22c71e0d04083f8336c1e..d78d6543e6a1ccbf28aafcdc76b48be2e6a093f1 100644 (file)
--- a/src/runtime/runtime.sf
+++ b/src/runtime/runtime.sf
@@ -26,7 +26,7 @@ USA.
 
 (load-option '*parser)                 ;for url.scm
 (fluid-let ((sf/default-syntax-table (->environment '(runtime))))
-  (load "host-adapter")
+  (load "host-adapter.scm")
   (sf-conditionally "graphics")
   (sf-conditionally "infstr")
   (sf-directory "."))