From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 20 Sep 2009 02:03:23 +0000 (-0700)
Subject: Don't use built-in Scheme executables; provide env var to override.
X-Git-Tag: 20100708-Gtk~332
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=5691ed807f4f05008c6e1eb2607c316550346955;p=mit-scheme.git

Don't use built-in Scheme executables; provide env var to override.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 42403dcb0..b8b6a83fa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -60,6 +60,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 # **** END BOILERPLATE ****
 
+MIT_SCHEME_NATIVE = mit-scheme-native
+MIT_SCHEME_C = mit-scheme-c
+
 LIARC_BOOT_BUNDLES = compiler cref sf star-parser
 LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin imail sos ssp xml
 
@@ -72,11 +75,11 @@ EDDIR = $(AUXDIR)/edwin
 all: @ALL_TARGET@
 
 all-native: compile-microcode
-	@$(top_srcdir)/etc/compile.sh mit-scheme-native --compiler
+	@$(top_srcdir)/etc/compile.sh $(MIT_SCHEME_NATIVE) --compiler
 	$(MAKE) build-bands
 
 all-liarc:
-	@$(top_srcdir)/etc/c-compile.sh mit-scheme-c --compiler
+	@$(top_srcdir)/etc/c-compile.sh $(MIT_SCHEME_C) --compiler
 	$(MAKE) compile-liarc-bundles build-bands
 
 compile-microcode:
@@ -92,8 +95,8 @@ build-bands:
 # **** Make liarc distribution from native ****
 
 liarc-dist:
-	@$(top_srcdir)/etc/compile-boot-compiler.sh mit-scheme-native
-	@$(top_srcdir)/etc/c-prepare.sh mit-scheme-native
+	@$(top_srcdir)/etc/compile-boot-compiler.sh $(MIT_SCHEME_NATIVE)
+	@$(top_srcdir)/etc/c-prepare.sh $(MIT_SCHEME_NATIVE)
 	$(MAKE) distclean
 
 # **** Build liarc from distribution ****
diff --git a/src/etc/create-makefiles.sh b/src/etc/create-makefiles.sh
index 94ec04961..c90c77ab3 100755
--- a/src/etc/create-makefiles.sh
+++ b/src/etc/create-makefiles.sh
@@ -49,7 +49,8 @@ run_cmd ln -s machine/compiler.pkg compiler/.
 
 BUNDLES="6001 compiler cref edwin imail sf sos ssp star-parser xdoc xml"
 
-: ${MIT_SCHEME_EXE='mit-scheme'}
+: ${MIT_SCHEME_EXE:=mit-scheme}
+export MIT_SCHEME_EXE
 
 run_cmd ${MIT_SCHEME_EXE} --heap 4000 <<EOF
 (begin
diff --git a/src/etc/make-native.sh b/src/etc/make-native.sh
index ced481971..405baf86f 100755
--- a/src/etc/make-native.sh
+++ b/src/etc/make-native.sh
@@ -39,11 +39,14 @@ if [ ${FASTP} = yes ]; then
     exec ./configure "${@}"
 fi
 
+: ${MIT_SCHEME_EXE:=mit-scheme-c}
+export MIT_SCHEME_EXE
+
 run_cmd ./Setup.sh
-MIT_SCHEME_EXE=mit-scheme-c run_configure --prefix=`pwd`/boot-root
+run_configure --prefix=`pwd`/boot-root
 run_cmd etc/compile-boot-compiler.sh mit-scheme-c
 run_cmd_in_dir compiler run_make compile-liarc-bundle
-run_cmd etc/native-prepare.sh mit-scheme-c
+run_cmd etc/native-prepare.sh "${MIT_SCHEME_EXE}"
 run_make compile-microcode
 
 run_cmd_in_dir runtime ../microcode/scheme --library ../lib \
diff --git a/src/microcode/makegen/makeinit.sh b/src/microcode/makegen/makeinit.sh
index 18b715f53..b20dc9d94 100755
--- a/src/microcode/makegen/makeinit.sh
+++ b/src/microcode/makegen/makeinit.sh
@@ -32,10 +32,8 @@
 # Generate "Makefile.in" from "Makefile.in.in".  Requires "config.h",
 # because dependencies are generated by running GCC -M on the source
 # files, which refer to "config.h".
-if [ -z "${SCHEME_LARGE}" ]; then
-    SCHEME_LARGE="scheme --large"
-fi
-${SCHEME_LARGE} <<EOF
+
+${MIT_SCHEME_EXE:=mit-scheme} <<EOF
 (begin
   (load "makegen/makegen.scm")
   (generate-makefile))