From c1055cffa16df62cac0b0ca56355761c790efe6f Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 1 Feb 1998 05:17:47 +0000
Subject: [PATCH] Patch loader so that debugging info will work on other
 systems.

---
 v7/src/6001/make.scm  | 21 ++++++++++++++-------
 v7/src/win32/make.scm | 15 +++++++++++----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/v7/src/6001/make.scm b/v7/src/6001/make.scm
index 6ef9f414f..c5a36d28e 100644
--- a/v7/src/6001/make.scm
+++ b/v7/src/6001/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 15.26 1998/01/23 00:23:08 cph Exp $
+$Id: make.scm,v 15.27 1998/02/01 05:17:17 cph Exp $
 
 Copyright (c) 1991-98 Massachusetts Institute of Technology
 
@@ -36,12 +36,19 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-(package/system-loader "6001" '() 'QUERY)
-(let ((edwin (->environment '(edwin))))
-  (load "edextra" edwin)
-  (if (and (eq? 'UNIX microcode-id/operating-system)
-	   (string-ci=? "HP-UX" microcode-id/operating-system-variant))
-      (load "floppy" edwin)))
+(with-working-directory-pathname (directory-pathname (current-load-pathname))
+  (lambda ()
+    ((access with-directory-rewriting-rule
+	     (->environment '(RUNTIME COMPILER-INFO)))
+     (working-directory-pathname)
+     (pathname-as-directory "6001")
+     (lambda ()
+       (package/system-loader "6001" '() 'QUERY)
+       (let ((edwin (->environment '(edwin))))
+	 (load "edextra" edwin)
+	 (if (and (eq? 'UNIX microcode-id/operating-system)
+		  (string-ci=? "HP-UX" microcode-id/operating-system-variant))
+	     (load "floppy" edwin)))))))
 ((access initialize-package! (->environment '(student scode-rewriting))))
 (add-system! (make-system "6.001" 15 23 '()))
 
diff --git a/v7/src/win32/make.scm b/v7/src/win32/make.scm
index 03d33a050..6731eff45 100644
--- a/v7/src/win32/make.scm
+++ b/v7/src/win32/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.2 1993/11/10 21:41:48 adams Exp $
+$Id: make.scm,v 1.3 1998/02/01 05:17:47 cph Exp $
 
-Copyright (c) 1993 Massachusetts Institute of Technology
+Copyright (c) 1993-98 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,16 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 
-(load "ffimacro")
+(with-working-directory-pathname (directory-pathname (current-load-pathname))
+  (lambda ()
+    ((access with-directory-rewriting-rule
+	     (->environment '(RUNTIME COMPILER-INFO)))
+     (working-directory-pathname)
+     (pathname-as-directory "win32")
+     (lambda ()
+       (load "ffimacro")
+       (package/system-loader "win32" '() 'QUERY)))))
 
-(package/system-loader "win32" '() 'QUERY)
 ;((package/reference (find-package '(WIN32))
 ;		    'INITIALIZE-PACKAGE!))
 (add-system! (make-system "Win32" 1 0 '()))
-- 
2.25.1