From 24cf76cd7792eb0399dd40ad5d4a264e5ae5cbfc Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Sat, 5 Oct 2013 21:55:06 +0000
Subject: [PATCH] Tweak native rules so they work for svm too.

---
 src/Makefile.boot.in | 5 +++++
 src/Makefile.in      | 5 ++++-
 src/configure.ac     | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.boot.in b/src/Makefile.boot.in
index f12095a92..924e9b898 100644
--- a/src/Makefile.boot.in
+++ b/src/Makefile.boot.in
@@ -189,11 +189,16 @@ compile-cross-compiler-rtlopt: syntax-cross-compiler
 # do the wrong thing if there is already a compiler loaded into the
 # image.
 .PHONY: syntax-cross-compiler
+@IF_SVM@syntax-cross-compiler: compiler/machines/svm/assembler-db.scm
 syntax-cross-compiler: cref-cross-compiler
 	(echo '(with-working-directory-pathname "compiler"' && \
 	 echo '  (lambda () (load "compiler.sf")))') \
 	| $(HOST_SYNTAXER)
 
+compiler/machines/svm/assembler-db.scm:
+	(cd compiler/machines/svm && \
+	 '$(MIT_SCHEME_EXE)' --batch-mode --load compile-assembler </dev/null)
+
 .PHONY: cref-cross-compiler
 cref-cross-compiler: cref-cross-cref
 cref-cross-compiler: cref-cross-sf
diff --git a/src/Makefile.in b/src/Makefile.in
index 4e82512c1..9a37b055a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -113,7 +113,9 @@ boot/compiler.com:
 boot/syntaxer.com:
 	@echo >&2 'Please run `make -f Makefile.boot'\'' first.'; exit 1
 
-microcode/scheme: compile-microcode
+@IF_SVM@microcode/scheme: microcode/svm1-defns.h
+microcode/scheme:
+	(cd microcode && $(MAKE) all)
 
 lib/runtime.com: compile-runtime
 @IF_CROSS@lib/runtime.com: cross-end
@@ -232,6 +234,7 @@ compile-compiler-rtlopt: syntax-compiler
 
 .PHONY: syntax-compiler
 syntax-compiler: bootstrap-toolchain
+@IF_SVM@syntax-compiler: compiler/machines/svm/svm1-defns.h
 syntax-compiler: cref-compiler
 	(echo '(with-working-directory-pathname "compiler"' && \
 	 echo '  (lambda () (load "compiler.sf")))') \
diff --git a/src/configure.ac b/src/configure.ac
index e75833cf9..6b3e8ddfd 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -82,16 +82,19 @@ c)
     ALL_TARGET=all-liarc
     INSTALL_COM=:
     INSTALL_LIARC_BUNDLES=install-liarc-bundles
+    IF_SVM=\#
     ;;
 svm1)
     ALL_TARGET=all-svm
     INSTALL_COM='$(INSTALL_DATA)'
     INSTALL_LIARC_BUNDLES=
+    IF_SVM=
     ;;
 *)
     ALL_TARGET=all-native
     INSTALL_COM='$(INSTALL_DATA)'
     INSTALL_LIARC_BUNDLES=
+    IF_SVM=\#
     ;;
 esac
 AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
-- 
2.25.1