Delay resolution of debugging-info filename until the file is needed.

diff --git a/v7/src/compiler/base/make.scm b/v7/src/compiler/base/make.scm
index 165d109e0619d0bb90824287aa4144531a3d8d0e..95755072c85e4beb025913b7dd7ffb05b503b76e 100644 (file)
--- a/v7/src/compiler/base/make.scm
+++ b/v7/src/compiler/base/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.101 1993/11/13 19:33:53 gjr Exp $
+$Id: make.scm,v 4.102 1993/11/18 01:21:12 cph Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -37,10 +37,15 @@ MIT in each case. |#
 (declare (usual-integrations))
 
 (lambda (architecture-name)
-  (load-option 'COMPRESS)
-  (load-option 'HASH-TABLE)
-  (load-option 'RB-TREE)
-  (package/system-loader "comp" '() 'QUERY)
+  ((access with-directory-rewriting-rule
+          (->environment '(RUNTIME COMPILER-INFO)))
+   (working-directory-pathname)
+   (pathname-as-directory "compiler")
+   (lambda ()
+     (load-option 'COMPRESS)
+     (load-option 'HASH-TABLE)
+     (load-option 'RB-TREE)
+     (package/system-loader "comp" '() 'QUERY)))
   (let ((initialize-package!
         (lambda (package-name)
           ((environment-lookup (->environment package-name)
@@ -49,5 +54,5 @@ MIT in each case. |#
     (initialize-package! '(COMPILER DECLARATIONS)))
   (add-system!
    (make-system (string-append "Liar (" architecture-name ")")
-               4 100
+               4 101
                '())))
\ No newline at end of file

diff --git a/v7/src/cref/make.scm b/v7/src/cref/make.scm
index 85ce4f27be1607c1f028f75484078320772771c7..aa56097b78e39fa98890c35f4d7c47729dcfe187 100644 (file)
--- a/v7/src/cref/make.scm
+++ b/v7/src/cref/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.9 1993/10/11 23:31:42 cph Exp $
+$Id: make.scm,v 1.10 1993/11/18 01:21:24 cph Exp $
 
 Copyright (c) 1988-93 Massachusetts Institute of Technology
 
@@ -36,6 +36,11 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-(load-option 'RB-TREE)
-(package/system-loader "cref" '() false)
-(add-system! (make-system "CREF" 1 9 '()))
\ No newline at end of file
+((access with-directory-rewriting-rule
+        (->environment '(RUNTIME COMPILER-INFO)))
+ (working-directory-pathname)
+ (pathname-as-directory "cref")
+ (lambda ()
+   (load-option 'RB-TREE)
+   (package/system-loader "cref" '() false)))
+(add-system! (make-system "CREF" 1 10 '()))
\ No newline at end of file

diff --git a/v7/src/edwin/make.scm b/v7/src/edwin/make.scm
index dc9b61ca8ba4b601d602e98ca18d1cd2a9276e8b..fc291b541f8326e0274043412c60a80688a170c9 100644 (file)
--- a/v7/src/edwin/make.scm
+++ b/v7/src/edwin/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 3.81 1993/11/15 21:49:08 cph Exp $
+$Id: make.scm,v 3.82 1993/11/18 01:20:59 cph Exp $
 
-Copyright (c) 1989-1993 Massachusetts Institute of Technology
+Copyright (c) 1989-93 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -36,9 +36,14 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-(declare-shared-library "edwin" (lambda () true))
-(package/system-loader
- "edwin"
- `((os-type . ,(intern (microcode-identification-item 'OS-NAME-STRING))))
- 'QUERY)
-(add-system! (make-system "Edwin" 3 81 '()))
\ No newline at end of file
+((access with-directory-rewriting-rule
+        (->environment '(RUNTIME COMPILER-INFO)))
+ (working-directory-pathname)
+ (pathname-as-directory "edwin")
+ (lambda ()
+   (declare-shared-library "edwin" (lambda () true))
+   (package/system-loader
+    "edwin"
+    `((os-type . ,(intern (microcode-identification-item 'OS-NAME-STRING))))
+    'QUERY)))
+(add-system! (make-system "Edwin" 3 82 '()))
\ No newline at end of file

diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm
index 58520c0dec27f64004e1edd4fb180a97198215e5..964617b918c11be92df27b4435710847604a1a7a 100644 (file)
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.27 1993/09/01 00:10:47 cph Exp $
+$Id: make.scm,v 4.28 1993/11/18 01:21:39 cph Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -36,7 +36,12 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-(package/system-loader "sf" '() 'QUERY)
+((access with-directory-rewriting-rule
+        (->environment '(RUNTIME COMPILER-INFO)))
+ (working-directory-pathname)
+ (pathname-as-directory "sf")
+ (lambda ()
+   (package/system-loader "sf" '() 'QUERY)))
 ((package/reference (find-package '(SCODE-OPTIMIZER))
                    'USUAL-INTEGRATIONS/CACHE!))
-(add-system! (make-system "SF" 4 27 '()))
\ No newline at end of file
+(add-system! (make-system "SF" 4 28 '()))
\ No newline at end of file

diff --git a/v8/src/sf/make.scm b/v8/src/sf/make.scm
index 58520c0dec27f64004e1edd4fb180a97198215e5..964617b918c11be92df27b4435710847604a1a7a 100644 (file)
--- a/v8/src/sf/make.scm
+++ b/v8/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.27 1993/09/01 00:10:47 cph Exp $
+$Id: make.scm,v 4.28 1993/11/18 01:21:39 cph Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -36,7 +36,12 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-(package/system-loader "sf" '() 'QUERY)
+((access with-directory-rewriting-rule
+        (->environment '(RUNTIME COMPILER-INFO)))
+ (working-directory-pathname)
+ (pathname-as-directory "sf")
+ (lambda ()
+   (package/system-loader "sf" '() 'QUERY)))
 ((package/reference (find-package '(SCODE-OPTIMIZER))
                    'USUAL-INTEGRATIONS/CACHE!))
-(add-system! (make-system "SF" 4 27 '()))
\ No newline at end of file
+(add-system! (make-system "SF" 4 28 '()))
\ No newline at end of file