Fix "(load-option 'compiler)" to work right with liarc.

diff --git a/v7/src/etc/c-initial-bands.sh b/v7/src/etc/c-initial-bands.sh
index 6d7af0ab1c4cac7a88398a5488e5c66b24de2ac0..c4d83b7b75918b387d7ba72d7a79e78d1b23ebc5 100755 (executable)
--- a/v7/src/etc/c-initial-bands.sh
+++ b/v7/src/etc/c-initial-bands.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: c-initial-bands.sh,v 1.5 2007/05/01 04:54:57 cph Exp $
+# $Id: c-initial-bands.sh,v 1.6 2007/05/02 13:50:59 cph Exp $
 #
 # Copyright 2007 Massachusetts Institute of Technology
 #
@@ -32,11 +32,7 @@ EOF
 
 microcode/scheme --library lib --large <<EOF
 (begin
-  (load-option (quote SF))
-  (load "lib/lib/compiler.so")
-  (with-working-directory-pathname "compiler"
-    (lambda ()
-      (load "machines/C/make")))
+  (load-option (quote COMPILER))
   (load-option (quote *PARSER))
   (load-option (quote CREF))
   (disk-save "lib/compiler.com"))

diff --git a/v7/src/etc/optiondb.scm b/v7/src/etc/optiondb.scm
index 18a96898cf7a2b0397b6263a3832e02c13d9f6aa..887694ddb5a2425d78f26cc70ac99f735ab49ffe 100644 (file)
--- a/v7/src/etc/optiondb.scm
+++ b/v7/src/etc/optiondb.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: optiondb.scm,v 1.19 2007/05/01 04:55:02 cph Exp $
+$Id: optiondb.scm,v 1.20 2007/05/02 13:51: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,
@@ -83,7 +83,11 @@ USA.
 
 (define-load-option 'COMPILER
   (lambda () (load-option 'SF))
-  (guarded-system-loader '(compiler) "compiler"))
+  (guarded-system-loader '(compiler)
+                        "compiler"
+                        (if (eq? microcode-id/compiled-code-type 'C)
+                            "machines/C/make"
+                            "make")))
 
 (define-load-option 'CREF
   (guarded-system-loader '(cross-reference) "cref"))