From 037275f2d64c17e19579b0ae9cdc50caeffce5b8 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 25 Apr 2017 14:10:56 -0700 Subject: [PATCH] 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. --- src/runtime/load.scm | 3 +-- src/runtime/runtime.pkg | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/runtime/load.scm b/src/runtime/load.scm index 7916feb66..1abe1d7d8 100644 --- 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 fd500ba44..cf1ace9d2 100644 --- 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) -- 2.25.1