/[cmucl]/src/code/save.lisp
ViewVC logotype

Diff of /src/code/save.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.55 by fgilham, Fri Jul 20 02:38:19 2007 UTC revision 1.56 by fgilham, Sat Jul 21 21:12:18 2007 UTC
# Line 45  Line 45 
45  (defvar lisp-environment-list)  (defvar lisp-environment-list)
46  (defvar *cmucl-lib*)            ; Essentially the envvar CMUCLLIB, if available  (defvar *cmucl-lib*)            ; Essentially the envvar CMUCLLIB, if available
47    
48  #+:executable                   ; A dumped executable image won't have  #+:executable
49  (defvar *old-cmucl-lib*)        ; any reasonable default library: search list.  Save  ;; A dumped executable image won't have any reasonable default
50                                  ; the one from when it was dumped..  ;; library: search list.  Save the one from when it was dumped.
51    (defvar *old-cmucl-library-search-list*)
52    
53  (defvar *cmucl-core-path*)      ; Path to where the Lisp core file was found.  (defvar *cmucl-core-path*)      ; Path to where the Lisp core file was found.
54    
# Line 106  Line 107 
107    (setf (search-list "library:")    (setf (search-list "library:")
108          (if (boundp '*cmucl-lib*)          (if (boundp '*cmucl-lib*)
109              (parse-unix-search-path *cmucl-lib*)              (parse-unix-search-path *cmucl-lib*)
110              (or #+:executable *old-cmucl-lib* '("/usr/local/lib/cmucl/lib/"))))              (or
111                 #+:executable
112                 *old-cmucl-library-search-list*
113                 '("/usr/local/lib/cmucl/lib/"))))
114    (setf (search-list "modules:") '("library:subsystems/"))    (setf (search-list "modules:") '("library:subsystems/"))
115    (setf (search-list "ld-library-path:")    (setf (search-list "ld-library-path:")
116          (parse-unix-search-list :ld_library_path)))          (parse-unix-search-list :ld_library_path)))
# Line 200  Line 204 
204    #+:executable    #+:executable
205    (when executable    (when executable
206      ;; Only do this when dumping an executable Lisp.  Otherwise      ;; Only do this when dumping an executable Lisp.  Otherwise
207      ;; worldload will make us lose when it clears the search lists.      ;; worldload will make us lose because it clears the search lists.
208      (setf *old-cmucl-lib* (search-list "library:")))      ;; If we are dumping an executable lisp image, we want to keep
209        ;; track of the library search list across dumps because the
210        ;; normal way for figuring out the library paths from arg[0] is
211        ;; almost guaranteed to be wrong for executables.
212        (setf *old-cmucl-library-search-list* (search-list "library:")))
213    
214    (if purify    (if purify
215        (purify :root-structures root-structures        (purify :root-structures root-structures

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56

  ViewVC Help
Powered by ViewVC 1.1.5