Softer landing for system-library-directory-pathname if sudirectory doesn't exist.

diff --git a/src/runtime/load.scm b/src/runtime/load.scm
index 698de18d3aaca55bc4f75d9a4f799ef9b1d98ce2..583694451032a169760c76a84c3f60adf8129aeb 100644 (file)
--- a/src/runtime/load.scm
+++ b/src/runtime/load.scm
@@ -376,7 +376,7 @@ USA.
 (define (load-library-object-file name errors?)
   (let ((pathname
         (merge-pathnames (pathname-new-type name "so")
-                         (system-library-directory-pathname "lib"))))
+                         (system-library-directory-pathname "lib" errors?))))
     (if (and errors? (not (file-regular? pathname)))
        (error "No library object file of this name:" name))
     (if (dld-loaded-file? pathname)

diff --git a/src/runtime/pathnm.scm b/src/runtime/pathnm.scm
index d64e673da643d116b77758fd97fbd6c53b266859..4fb323e1479aabec9d80b9423fa0915df5e79c96 100644 (file)
--- a/src/runtime/pathnm.scm
+++ b/src/runtime/pathnm.scm
@@ -605,7 +605,7 @@ these rules:
 (define (system-library-directory-pathname #!optional pathname required?)
   (if (if (default-object? pathname) #f pathname)
       (let ((dir (%find-library-file pathname)))
-       (cond ((file-directory? dir)
+       (cond ((and dir (file-directory? dir))
               (pathname-as-directory dir))
              ((if (default-object? required?) #f required?)
               (system-library-directory-pathname