Avoid CBF in win32.sf.

diff --git a/src/Makefile.in b/src/Makefile.in
index ae08e71ea4bee99d360ab581ec23b8b4ffd699f2..c4ab9c9ae2c30687fe32b836276c9c3ea3513c15 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -425,15 +425,12 @@ compile-win32: syntax-win32
         echo '  (lambda () (load "win32.cbf")))') \
        | $(BOOTSTRAP_COMPILER)
 
-# This has to use BOOTSTRAP_TOOLCHAIN, not just BOOTSTRAP_SYNTAXER,
-# because it compiles the macro file and then loads it.  (XXX WRONG!
-# Not gonna work for cross-compilation.)
 .PHONY: syntax-win32
 syntax-win32: bootstrap-toolchain
 syntax-win32: cref-win32
        (echo '(with-working-directory-pathname "win32"' && \
         echo '  (lambda () (load "win32.sf")))') \
-       | $(BOOTSTRAP_TOOLCHAIN)
+       | $(BOOTSTRAP_SYNTAXER)
 
 .PHONY: cref-win32
 cref-win32: bootstrap-toolchain

diff --git a/src/win32/win32.sf b/src/win32/win32.sf
index a35b6e2e67d9911c8889b368d3848a51a89ab8dd..9face2bdae60046093fd0aa1058dbcdfc48e681c 100644 (file)
--- a/src/win32/win32.sf
+++ b/src/win32/win32.sf
@@ -34,8 +34,6 @@ USA.
 
 (fluid-let ((sf/default-syntax-table (->environment '(WIN32))))
   (sf-conditionally "ffimacro")
-  (if (not (file-modification-time<? "ffimacro.bin" "ffimacro.com"))
-      (cbf "ffimacro"))
   (load "ffimacro" '(WIN32 FFI-MACRO))
 
   (sf-conditionally "winuser")