From: Taylor R Campbell <campbell@mumble.net>
Date: Sat, 5 Oct 2013 20:33:00 +0000 (+0000)
Subject: Avoid CBF in win32.sf.
X-Git-Tag: release-9.2.0~100^2~7
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=aa7178209b8f0c91208c264f4c11e0890938c091;p=mit-scheme.git

Avoid CBF in win32.sf.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index ae08e71ea..c4ab9c9ae 100644
--- 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 a35b6e2e6..9face2bda 100644
--- 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")