From: Taylor R Campbell <campbell@mumble.net>
Date: Tue, 8 Jan 2019 05:31:57 +0000 (+0000)
Subject: Avoid compiler:cross-compiling? in liarc.
X-Git-Tag: mit-scheme-pucked-10.1.10~6^2~73
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3f22da23f6ecb6976fc5d6380ddf44e800c8608c;p=mit-scheme.git

Avoid compiler:cross-compiling? in liarc.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 58d56c550..d9250eae1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -79,10 +79,12 @@ AUXDIR = @AUXDIR@
 MAKE_IN_SUBDIRS = \
 	f () { t=$$1; shift; for d; do (cd "$$d" && $(MAKE) "$$t"); done; }; f
 
-@IF_CROSS@COMPILER_SETTINGS_CROSS = (set! compiler:cross-compiling? true)
+@IF_LIARC@NO_LIARC = \#;
+@IF_CROSS@COMPILER_SETTINGS_CROSS = \
+@IF_CROSS@	$(NO_LIARC)(set! compiler:cross-compiling? true)
 @IF_CROSS@SF_SETTINGS_CROSS = \
-@IF_CROSS@	(set! sf/cross-compiling? true) \
-@IF_CROSS@	(set! package/cross-compiling? true) \
+@IF_CROSS@	$(NO_LIARC)(set! sf/cross-compiling? true) \
+@IF_CROSS@	$(NO_LIARC)(set! package/cross-compiling? true) \
 @IF_CROSS@	(set! target-bytes-per-object \
 @IF_CROSS@	      (lambda () @mit_scheme_target_bytes_per_object@))
 @IF_LIARC@COMPILER_SETTINGS_LIARC = (set! compiler:invoke-c-compiler? false)
@@ -123,8 +125,8 @@ TOOL_RUNTIME_ONLY = $(TOOL_MIT_SCHEME) $(TOOL_RUNTIME_ONLY_BAND) \
 
 # Convert host fasl files to target fasl files.
 TOOL_CROSS_HOST = $(TOOL_COMPILER) \
-  --eval '(load "etc/crossbin")' \
-  --eval '(apply convert fasl-format:@mit_scheme_native_code@ (cdr (member "--" (command-line))))' \
+  --eval '(begin $(NO_LIARC)(load "etc/crossbin"))' \
+  --eval '(begin $(NO_LIARC)(apply convert fasl-format:@mit_scheme_native_code@ (cdr (member "--" (command-line)))))' \
   --eval '(%exit 0)' \
   --