From e2f02ad73ce6c02730173e8d56ab86efcfefac71 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 15 Apr 2007 15:41:12 +0000
Subject: [PATCH] Change handles for liarc files to use output pathname, not
 input pathname.

---
 v7/src/compiler/base/toplev.scm         | 6 ++++--
 v7/src/compiler/machines/C/compiler.pkg | 3 ++-
 v7/src/compiler/machines/C/cout.scm     | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/v7/src/compiler/base/toplev.scm b/v7/src/compiler/base/toplev.scm
index ef7ae7710..a206eb3bb 100644
--- a/v7/src/compiler/base/toplev.scm
+++ b/v7/src/compiler/base/toplev.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: toplev.scm,v 4.72 2007/04/14 05:52:53 cph Exp $
+$Id: toplev.scm,v 4.73 2007/04/15 15:41:04 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -139,7 +139,8 @@ USA.
 	 (and (not (default-object? output-string)) output-string)
 	 (make-pathname #f #f #f #f "bin" 'NEWEST)
 	 (lambda (input-pathname output-pathname)
-	   (fluid-let ((*compiler-input-pathname* input-pathname))
+	   (fluid-let ((*compiler-input-pathname* input-pathname)
+		       (*compiler-output-pathname* output-pathname))
 	     (let ((scode (compiler-fasload input-pathname)))
 	       (if (and (scode/constant? scode)
 			(not compiler:compile-data-files-as-expressions?))
@@ -163,6 +164,7 @@ USA.
 
 (define *debugging-key*)
 (define *compiler-input-pathname*)
+(define *compiler-output-pathname*)
 
 (define (maybe-open-file open? pathname receiver)
   (if open?
diff --git a/v7/src/compiler/machines/C/compiler.pkg b/v7/src/compiler/machines/C/compiler.pkg
index 698a9948b..fd1c6c61a 100644
--- a/v7/src/compiler/machines/C/compiler.pkg
+++ b/v7/src/compiler/machines/C/compiler.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compiler.pkg,v 1.22 2007/04/14 03:52:27 cph Exp $
+$Id: compiler.pkg,v 1.23 2007/04/15 15:41:08 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -257,6 +257,7 @@ USA.
 	  )
   (export (compiler)
 	  *compiler-input-pathname*
+	  *compiler-output-pathname*
 	  canonicalize-label-name)
   (export (compiler fg-generator)
 	  compile-recursively)
diff --git a/v7/src/compiler/machines/C/cout.scm b/v7/src/compiler/machines/C/cout.scm
index 0617817ca..0557488f2 100644
--- a/v7/src/compiler/machines/C/cout.scm
+++ b/v7/src/compiler/machines/C/cout.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: cout.scm,v 1.35 2007/04/14 03:52:31 cph Exp $
+$Id: cout.scm,v 1.36 2007/04/15 15:41:12 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -103,7 +103,7 @@ USA.
 	   (declare-dynamic-object-initialization handle)))
 
 (define (default-file-handle)
-  (or (liarc-object-pathname->handle *compiler-input-pathname*)
+  (or (liarc-object-pathname->handle *compiler-output-pathname*)
       "handle"))
 
 (define (stringify suffix initial-label lap-code info-output-pathname)
-- 
2.25.1