From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Wed, 25 May 2016 21:53:16 +0000 (-0700)
Subject: runtime/pathnm.scm (system-library-pathname): Always search.
X-Git-Tag: mit-scheme-pucked-9.2.12~261^2~45
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f2e233a31f09d7e716f87f2aa2ef202c5513c39e;p=mit-scheme.git

runtime/pathnm.scm (system-library-pathname): Always search.

When not required?, system-library-pathname did not search the system-
library-path at all.  It just merged with the first directory.
---

diff --git a/src/runtime/pathnm.scm b/src/runtime/pathnm.scm
index 5563dcab8..1b8fb4b35 100644
--- a/src/runtime/pathnm.scm
+++ b/src/runtime/pathnm.scm
@@ -609,8 +609,8 @@ these rules:
     ((host-type/operation/init-file-pathname (host/type host)) host)))
 
 (define (system-library-pathname pathname #!optional required?)
-  (if (if (default-object? required?) #t required?)
-      (or (%find-library-file pathname)
+  (or (%find-library-file pathname)
+      (if (if (default-object? required?) #t required?)
 	  (system-library-pathname
 	   (error:file-operation pathname
 				 "find"
@@ -618,8 +618,8 @@ these rules:
 				 "no such file in system library path"
 				 system-library-pathname
 				 (list pathname required?))
-	   required?))
-      (merge-pathnames pathname (%find-library-directory))))
+	   required?)
+	  (merge-pathnames pathname (%find-library-directory)))))
 
 (define (system-library-directory-pathname #!optional pathname required?)
   (if (if (default-object? pathname) #f pathname)