[cmucl-cvs] CMUCL commit: src/code (save.lisp)

[Raymond Toy]

    Date: Sunday, September 26, 2010 @ 16:40:51
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/code

Modified: save.lisp

Actually set the library search list to the saved value.  Previously
we weren't because *cmucl-lib* is almost always bound.  Normally
*old-cmucl-library-search-list* is unbound, but when a core is made,
it becomes bound.  We use that to indicate that the library search
list should be set to *old-cmucl-library-search-list*.


-----------+
 save.lisp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


Index: src/code/save.lisp
diff -u src/code/save.lisp:1.70 src/code/save.lisp:1.71
--- src/code/save.lisp:1.70	Sun May 16 08:28:31 2010
+++ src/code/save.lisp	Sun Sep 26 16:40:51 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/save.lisp,v 1.70 2010-05-16 12:28:31 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/code/save.lisp,v 1.71 2010-09-26 20:40:51 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -110,7 +110,9 @@
 	    (list (default-directory))))
 
   (setf (search-list "library:")
-	(if (boundp '*cmucl-lib*)
+	(if (and (boundp '*cmucl-lib*)
+		 #+:executable
+		 (not (boundp '*old-cmucl-library-search-list*)))
 	    (parse-unix-search-path *cmucl-lib*)
 	    (or
 	     #+:executable