From: Taylor R Campbell <campbell@mumble.net>
Date: Sun, 6 Oct 2013 22:22:09 +0000 (+0000)
Subject: First whack at making new build system work for liarc.
X-Git-Tag: release-9.2.0~92
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=9b4a10603d3ff45bdc29c45f10f099d85dc25872;p=mit-scheme.git

First whack at making new build system work for liarc.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 30eb8f34a..7a29d7141 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -96,7 +96,12 @@ all-native: compile-win32
 all-native: compile-xml
 @IF_CROSS@all-native: cross-target
 
-@IF_CROSS@COMPILER_SETTINGS = (set! compiler:cross-compiling? true)
+@IF_CROSS@COMPILER_SETTINGS_CROSS = (set! compiler:cross-compiling? true)
+@IF_LIARC@COMPILER_SETTINGS_LIARC = (set! compiler:invoke-c-compiler? false)
+
+COMPILER_SETTINGS = \
+	$(COMPILER_SETTINGS_CROSS) \
+	$(COMPILER_SETTINGS_LIARC)
 
 HOST_SCHEME = '$(MIT_SCHEME_EXE)' --batch-mode
 TOOL_COMPILER = $(TOOL_TOOLCHAIN)
@@ -113,6 +118,7 @@ tools/compiler.com:
 tools/syntaxer.com:
 	@echo >&2 'Please run `make -f Makefile.tools'\'' first.'; exit 1
 
+@IF_LIARC@microcode/scheme: compile-runtime
 @IF_SVM@microcode/scheme: microcode/svm1-defns.h
 microcode/scheme:
 	(cd microcode && $(MAKE) all)
@@ -277,11 +283,22 @@ cref-cref: cref-runtime
 
 .PHONY: compile-runtime
 compile-runtime: toolchain
+@IF_LIARC@compile-runtime: compile-runtime-pkd
 compile-runtime: syntax-runtime
 	(echo '(with-working-directory-pathname "runtime"' && \
 	 echo '  (lambda () (load "runtime.cbf")))') \
 	| $(TOOL_COMPILER)
 
+.PHONY: compile-runtime-pkd
+compile-runtime-pkd: toolchain
+compile-runtime-pkd: cref-runtime
+	(echo '(with-working-directory-pathname "runtime"' && \
+	 echo '  (lambda ()' && \
+	 echo '    (cbf "runtime-os2.pkd")' && \
+	 echo '    (cbf "runtime-unx.pkd")' && \
+	 echo '    (cbf "runtime-w32.pkd")))') \
+	| $(TOOL_COMPILER)
+
 .PHONY: compile-runtime
 syntax-runtime: toolchain
 syntax-runtime: cref-runtime
diff --git a/src/configure.ac b/src/configure.ac
index 28eae18bb..e7ddee137 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -77,12 +77,14 @@ DEFAULT_TARGET=${with_default_target}
 AC_CANONICAL_HOST
 
 MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}])
+IF_LIARC=\#
+IF_SVM=\#
 case ${mit_scheme_native_code} in
 c)
     ALL_TARGET=all-liarc
     INSTALL_COM=:
     INSTALL_LIARC_BUNDLES=install-liarc-bundles
-    IF_SVM=\#
+    IF_LIARC=
     ;;
 svm1)
     ALL_TARGET=all-svm
@@ -94,7 +96,6 @@ svm1)
     ALL_TARGET=all-native
     INSTALL_COM='$(INSTALL_DATA)'
     INSTALL_LIARC_BUNDLES=
-    IF_SVM=\#
     ;;
 esac
 AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
@@ -170,6 +171,7 @@ AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([AUXDIR_NAME])
 AC_SUBST([AUXDIR])
 AC_SUBST([IF_CROSS])
+AC_SUBST([IF_LIARC])
 AC_SUBST([IF_SVM])
 
 AC_PROG_INSTALL