Guarantee that the ".bin" version of each file is loaded. Otherwise,

an existing ".com" could override the changes to a given file.

diff --git a/v7/src/compiler/machines/bobcat/compiler.sf b/v7/src/compiler/machines/bobcat/compiler.sf
index 48333a846b8393d1ea0a1b868de17b27fabae69c..6c7d97b7aa1553d587b88932e58ceab56178cd40 100644 (file)
--- a/v7/src/compiler/machines/bobcat/compiler.sf
+++ b/v7/src/compiler/machines/bobcat/compiler.sf
@@ -6,7 +6,10 @@
 (let ((sf-and-load
        (lambda (files package)
         (sf-conditionally files)
-        (load files (package/environment (find-package package)))))
+        (let ((environment (package/environment (find-package package))))
+          (for-each (lambda (file)
+                      (load (string-append file ".bin") environment))
+                    files))))
       (compiler-package (find-package '(COMPILER))))
   (write-string "\n\n---- Loading compile-time files ----")
   (sf-and-load '("base/switch" "base/hashtb") '(COMPILER))