From ff6898b198f420c98ac72cc99078ca26d3c13330 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 13 Jun 2007 13:37:03 +0000
Subject: [PATCH] Change SOS so that it's not a boot bundle.  Use cross
 compiler when building native system with liarc.

---
 v7/src/Makefile.in     |  6 +++---
 v7/src/etc/compile.scm | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/v7/src/Makefile.in b/v7/src/Makefile.in
index 0f0a44146..a42cf106d 100644
--- a/v7/src/Makefile.in
+++ b/v7/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.42 2007/06/09 01:22:11 cph Exp $
+# $Id: Makefile.in,v 1.43 2007/06/13 13:36:38 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -61,8 +61,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 # **** END BOILERPLATE ****
 
-LIARC_BOOT_BUNDLES = compiler cref sf sos star-parser
-LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin imail ssp xml
+LIARC_BOOT_BUNDLES = compiler cref sf star-parser
+LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin imail sos ssp xml
 
 SUBDIRS = $(INSTALLED_SUBDIRS) 6001 compiler rcs win32 xdoc
 INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
diff --git a/v7/src/etc/compile.scm b/v7/src/etc/compile.scm
index 23ea33320..5493a1769 100644
--- a/v7/src/etc/compile.scm
+++ b/v7/src/etc/compile.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compile.scm,v 1.24 2007/06/09 02:42:29 cph Exp $
+$Id: compile.scm,v 1.25 2007/06/13 13:37:03 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -35,6 +35,7 @@ USA.
 
 (define (compile-all-dirs compile-dir)
   (compile-boot-dirs compile-dir)
+  (compile-dir "sos")
   (with-working-directory-pathname "sos"
     (lambda ()
       (load "load")))
@@ -42,8 +43,7 @@ USA.
 
 (define (compile-boot-dirs compile-dir)
   (compile-cref compile-dir)
-  (for-each compile-dir
-	    '("runtime" "cref" "sf" "compiler" "star-parser" "sos")))
+  (for-each compile-dir '("runtime" "cref" "sf" "compiler" "star-parser")))
 
 (define (compile-cref compile-dir)
   (compile-dir "cref")
@@ -90,13 +90,21 @@ USA.
 
 (define (native-prepare)
   (load-option 'SF)
+  (load-option 'CREF)
   (let ((make-file (compiler-make-file)))
     (with-working-directory-pathname "compiler"
       (lambda ()
 	(load "compiler.so")
 	(load make-file))))
-  (compile-boot-dirs compile-dir)
-  (sf "microcode/utabmd"))
+  (fluid-let ((compiler:cross-compiling? #t))
+    (compile-boot-dirs compile-dir)
+    (sf "microcode/utabmd")))
+
+(define (compiler-make-file)
+  (string-append
+   (or (file-symbolic-link? "compiler/machine")
+       (error "Missing compiler/machine link."))
+   "/make"))
 
 (define (c-compile)
   (in-liarc
-- 
2.25.1