Add --no-init-file to those places that might be calls to 9.2.

This isn't needed any more since --no-init-file is implied by --batch-mode, and
can be removed after the next release.

diff --git a/src/Makefile.in b/src/Makefile.in
index fe8635cc0c53068dd1d1492f064baa31fec0d2a5..8cb74b7c93c4ac7de91b7087dc413c8ef9336869 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -79,11 +79,11 @@ HOST_COMPILER_SETTINGS = \
        $(COMPILER_SETTINGS_CROSS) \
        $(COMPILER_SETTINGS_LIARC)
 
-HOST_COMPILER = '$(MIT_SCHEME_EXE)' --batch-mode $(HOST_COMPILER_HEAP) \
+HOST_COMPILER = '$(MIT_SCHEME_EXE)' --batch-mode $(HOST_COMPILER_HEAP) --no-init-file \
   --eval '(begin $(HOST_COMPILER_SETTINGS))' --load runtime/host-adapter.scm
 
 HOST_RUNTIME_ONLY = '$(MIT_SCHEME_EXE)' --batch-mode $(HOST_COMPILER_HEAP) \
-  --band runtime.com --load runtime/host-adapter.scm
+  --band runtime.com --no-init-file --load runtime/host-adapter.scm
 
 # This rule is for LIARC.
 .SUFFIXES: .bld .pkd .c
@@ -563,7 +563,7 @@ install-auxdir-top:
 
 .PHONY: all-liarc
 all-liarc:
-       @$(top_srcdir)/etc/c-compile.sh "$(MIT_SCHEME_EXE)" --batch-mode
+       @$(top_srcdir)/etc/c-compile.sh "$(MIT_SCHEME_EXE)" --batch-mode --no-init-file
        $(MAKE) compile-liarc-bundles build-bands
 
 .PHONY: build-bands

diff --git a/src/Setup.sh b/src/Setup.sh
index 5a243f24d753b3d6d15c301ac406c69e214dffaf..197328bd3e15064fcd892c642da94747a09c5bae 100755 (executable)
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@ -47,7 +47,7 @@ trap clean EXIT INT TERM
 #   src/configure.ac
 #   src/etc/make-native.sh
 
-if ! "${MIT_SCHEME_EXE}" --batch-mode --eval '(%exit)' > /dev/null 2> /dev/null
+if ! "${MIT_SCHEME_EXE}" --batch-mode --no-init-file --eval '(%exit)' > /dev/null 2> /dev/null
 then
     cat <<EOF >&2
 *** Error in ${0}

diff --git a/src/configure.ac b/src/configure.ac
index c9803dda76d5d5525b72bd2db93ea79e7b4c48d7..c48b6210e499d0be01fe1cf144ba534331688aaf 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -188,13 +188,13 @@ if test x"${with_scheme_build}" != xdefault; then
         ;;
     esac
     MIT_SCHEME_EXE=${HOST_BUILD_DIR}run-build
-    if "${MIT_SCHEME_EXE}" --batch-mode --eval '(%exit)' >/dev/null 2>&1; then
+    if "${MIT_SCHEME_EXE}" --batch-mode --no-init-file --eval '(%exit)' >/dev/null 2>&1; then
         AC_MSG_RESULT([yes, using ${MIT_SCHEME_EXE}])
     else
         AC_MSG_ERROR([no, unable to use ${MIT_SCHEME_EXE}])
     fi
     # To get some version numbers into the build log:
-    ${MIT_SCHEME_EXE} --version
+    ${MIT_SCHEME_EXE} --no-init-file --version
 else
     AC_MSG_CHECKING([for an existing MIT/GNU Scheme installation])
     # Kinda hairy logic to detect this: (1) Use MIT_SCHEME_EXE, and
@@ -212,21 +212,21 @@ else
         found_p=yes
     elif test x"${MIT_SCHEME_EXE}" != x; then
         env_p=yes
-        if "${MIT_SCHEME_EXE}" --batch-mode --eval '(%exit)' >/dev/null 2>&1;
+        if "${MIT_SCHEME_EXE}" --batch-mode --no-init-file --eval '(%exit)' >/dev/null 2>&1;
         then
             found_p=yes
         fi
-    elif "${native_exe}" --batch-mode --eval '(%exit)' >/dev/null 2>&1; then
+    elif "${native_exe}" --batch-mode --no-init-file --eval '(%exit)' >/dev/null 2>&1; then
         MIT_SCHEME_EXE="${native_exe}"
         found_p=yes
-    elif mit-scheme --batch-mode --eval '(%exit)' >/dev/null 2>&1; then
+    elif mit-scheme --batch-mode --no-init-file --eval '(%exit)' >/dev/null 2>&1; then
         MIT_SCHEME_EXE=mit-scheme
         found_p=yes
     fi
     if test x"${found_p}" = xyes; then
         AC_MSG_RESULT([yes, using ${MIT_SCHEME_EXE}])
         # To get some version numbers into the build log:
-        ${MIT_SCHEME_EXE} --version
+        ${MIT_SCHEME_EXE} --version --no-init-file
     else
         message=
         if test x"${env_p}" = xyes; then
@@ -256,7 +256,7 @@ fi
 # A 32bit host running LIAR/svm needs a large heap.
 small_words='(= 4 (vector-ref (gc-space-status) 0))'
 if test x"${mit_scheme_native_code}" = xsvm1 \
-       && ${MIT_SCHEME_EXE} --eval "(%exit (if ${small_words} 0 1))" >/dev/null; then \
+       && ${MIT_SCHEME_EXE} --no-init-file --eval "(%exit (if ${small_words} 0 1))" >/dev/null; then \
     HOST_COMPILER_HEAP="--heap 10000"
 fi
 

diff --git a/src/etc/create-makefiles.sh b/src/etc/create-makefiles.sh
index a9ed0a8ec526e7eef8505c83ab5373eb13822a5d..bce7433f52d737d2ecd3ee20d2fe5c634c88ea2e 100755 (executable)
--- a/src/etc/create-makefiles.sh
+++ b/src/etc/create-makefiles.sh
@@ -49,7 +49,7 @@ run_cmd ln -s machine/compiler.pkg compiler/.
 
 BUNDLES="6001 compiler cref ffi sf sos ssp star-parser xdoc xml"
 
-run_cmd ${HOST_SCHEME_EXE} --batch-mode --heap 4000 <<EOF
+run_cmd ${HOST_SCHEME_EXE} --batch-mode --heap 4000 --no-init-file <<EOF
 (begin
   (load "etc/utilities")
   (generate-c-bundles (quote (${BUNDLES})) "${MDIR}"))

diff --git a/src/etc/make-native.sh b/src/etc/make-native.sh
index ff5f775c6693d7883b5aa6c949832cdcb279b0da..f4cd02ff0dfecedc145f02d82b41ddcc7b5d4804 100755 (executable)
--- a/src/etc/make-native.sh
+++ b/src/etc/make-native.sh
@@ -79,7 +79,7 @@ EOF
 
 test_exp='(begin (write microcode-id/compiled-code-type) (%exit 0))'
 scheme_failure=
-cc_type=`"${MIT_SCHEME_EXE}" --batch-mode --eval "${test_exp}" 2>/dev/null` \
+cc_type=`"${MIT_SCHEME_EXE}" --batch-mode --no-init-file --eval "${test_exp}" 2>/dev/null` \
   || scheme_failure=yes
 
 if [ yes = "${scheme_failure}" ]; then

diff --git a/src/microcode/makegen/makeinit.sh b/src/microcode/makegen/makeinit.sh
index c58259a2f008ba70d7f5a5c2aec4a946f96d7f9a..db549bce218cbe37908400858c27b577cddb560c 100755 (executable)
--- a/src/microcode/makegen/makeinit.sh
+++ b/src/microcode/makegen/makeinit.sh
@@ -48,7 +48,7 @@ touch Makefile.in
 # "config.h", because dependencies are generated by running GCC -M on
 # the source files, which refer to "config.h".
 
-"${MIT_SCHEME_EXE:-mit-scheme}" --batch-mode <<EOF
+"${MIT_SCHEME_EXE:-mit-scheme}" --batch-mode --no-init-file <<EOF
 (begin
   (load "makegen/makegen.scm")
   (generate-makefile))