From 666a4e114c78549f02b587d1d83f454946bb5af5 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 10 Feb 2018 17:55:28 -0800
Subject: [PATCH] Make sure that host-adapter causes rebuild of toolchain.

Also always load the .scm file since the compiled files may be out of date.
---
 src/Makefile.in        | 2 +-
 src/Makefile.tools.in  | 2 ++
 src/runtime/runtime.sf | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 6091dca86..1341e6562 100644
--- 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 23f09cc83..843532e68 100644
--- 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 804ac3a3f..d78d6543e 100644
--- 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 "."))
-- 
2.25.1