From f2e233a31f09d7e716f87f2aa2ef202c5513c39e Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Wed, 25 May 2016 14:53:16 -0700 Subject: [PATCH] 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. --- src/runtime/pathnm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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) -- 2.25.1