runtime/load (standard-library-directory-pathname): Simplify.

Just use the last directory in the path.  When microcode modules go
away, so will the lib/ subdirectory that previously distinguished the
"standard" options' directory.

diff --git a/src/runtime/load.scm b/src/runtime/load.scm
index 7916feb662402358df8da894df015cf7f2d68685..1abe1d7d840b95ac3d0f7dc231e55cab0bb0b079 100644 (file)
--- a/src/runtime/load.scm
+++ b/src/runtime/load.scm
@@ -433,8 +433,7 @@ USA.
              (thunk)))))))
 
 (define (standard-library-directory-pathname)
-  (let ((d (system-library-directory-pathname "lib")))
-    (pathname-new-directory d (except-last-pair (pathname-directory d)))))
+  (last library-directory-path))
 
 (define (pathname->standard-uri pathname)
   (let ((uri

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index fd500ba44e7f66a0300494671797e7fdfbddae5d..cf1ace9d2a7fd7a6c61c088ce237d2b82ef8dbba 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -3413,6 +3413,8 @@ USA.
          system-library-pathname
          uri->pathname
          user-homedir-pathname)
+  (export (runtime load)
+         library-directory-path)
   (initialization (initialize-package!)))
 
 (define-package (runtime pathname unix)