runtime/pathnm.scm (system-library-pathname): Always search.
authorMatt Birkholz <puck@birchwood-abbey.net>
Wed, 25 May 2016 21:53:16 +0000 (14:53 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Wed, 25 May 2016 21:53:16 +0000 (14:53 -0700)
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

index 5563dcab85fb79f3858dc317ccab859ebfbb04ef..1b8fb4b3585c012ab120be324dafbc8963c0b04b 100644 (file)
@@ -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)