From fa66f724932cbeefd8cc11e60d43fbe13246edc3 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Tue, 4 Feb 2014 14:01:12 -0700
Subject: [PATCH] Fluidize (runtime pathname) internal library-directory-path.

---
 src/ffi/ffi.pkg        |  4 +---
 src/runtime/pathnm.scm | 17 +++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/ffi/ffi.pkg b/src/ffi/ffi.pkg
index 8e772b589..0e4f0e31b 100644
--- a/src/ffi/ffi.pkg
+++ b/src/ffi/ffi.pkg
@@ -40,11 +40,9 @@ FFI System Packaging |#
 (define-package (ffi build)
   (parent ())
   (files "build")
-  (import (runtime pathname)
-	  library-directory-path)
   (export (ffi)
 	  compile-shim
 	  link-shim
 	  install-shim
 	  install-load-option
-	  install-html))
\ No newline at end of file
+	  install-html))
diff --git a/src/runtime/pathnm.scm b/src/runtime/pathnm.scm
index ca0377f02..ae9c22fc3 100644
--- a/src/runtime/pathnm.scm
+++ b/src/runtime/pathnm.scm
@@ -634,18 +634,18 @@ these rules:
 				'with-system-library-directories
 				directories))))
 
-  (fluid-let ((library-directory-path
-	       (append (map existing-directory directories)
-		       library-directory-path)))
-    (thunk)))
+  (let-fluid library-directory-path
+	     (append (map existing-directory directories)
+		     (fluid library-directory-path))
+    thunk))
 
 (define (%find-library-directory)
   (pathname-simplify
-   (or (find-matching-item library-directory-path file-directory?)
+   (or (find-matching-item (fluid library-directory-path) file-directory?)
        (error "Can't find library directory."))))
 
 (define (%find-library-file pathname)
-  (let loop ((path library-directory-path))
+  (let loop ((path (fluid library-directory-path)))
     (and (pair? path)
 	 (let ((p (merge-pathnames pathname (car path))))
 	   (if (file-exists? p)
@@ -719,8 +719,9 @@ these rules:
   (set! *default-pathname-defaults*
 	(make-fluid (make-pathname local-host #f #f #f #f #f)))
   (set! library-directory-path
-	(map pathname-as-directory
-	     (vector->list ((ucode-primitive microcode-library-path 0)))))
+	(make-fluid
+	 (map pathname-as-directory
+	      (vector->list ((ucode-primitive microcode-library-path 0))))))
   unspecific)
 
 (define (initialize-package!)
-- 
2.25.1