From a670cc9a38d33b79a6ec5f7a68eebf75c6291fcc Mon Sep 17 00:00:00 2001 From: Joe Marshall Date: Tue, 31 Aug 2010 13:25:58 -0700 Subject: [PATCH] Softer landing for system-library-directory-pathname if sudirectory doesn't exist. --- src/runtime/load.scm | 2 +- src/runtime/pathnm.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/load.scm b/src/runtime/load.scm index 698de18d3..583694451 100644 --- 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 d64e673da..4fb323e14 100644 --- 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 -- 2.25.1