/[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.54 by fgilham, Sat Jul 7 17:17:40 2007 UTC revision 1.55 by fgilham, Fri Jul 20 02:38:19 2007 UTC
# Line 44  Line 44 
44  ;;; Filled in by the startup code.  ;;; Filled in by the startup code.
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
49    (defvar *old-cmucl-lib*)        ; any reasonable default library: search list.  Save
50                                    ; the one from when it was dumped..
51    
52  (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.
53    
54  ;;; Filled in by the save code.  ;;; Filled in by the save code.
# Line 101  Line 106 
106    (setf (search-list "library:")    (setf (search-list "library:")
107          (if (boundp '*cmucl-lib*)          (if (boundp '*cmucl-lib*)
108              (parse-unix-search-path *cmucl-lib*)              (parse-unix-search-path *cmucl-lib*)
109              '("/usr/local/lib/cmucl/lib/")))              (or #+:executable *old-cmucl-lib* '("/usr/local/lib/cmucl/lib/"))))
110    (setf (search-list "modules:") '("library:subsystems/"))    (setf (search-list "modules:") '("library:subsystems/"))
111    (setf (search-list "ld-library-path:")    (setf (search-list "ld-library-path:")
112          (parse-unix-search-list :ld_library_path)))          (parse-unix-search-list :ld_library_path)))
# Line 191  Line 196 
196      (eval:flush-interpreted-function-cache))      (eval:flush-interpreted-function-cache))
197    (when (fboundp 'cancel-finalization)    (when (fboundp 'cancel-finalization)
198      (cancel-finalization sys:*tty*))      (cancel-finalization sys:*tty*))
199    
200      #+:executable
201      (when executable
202        ;; Only do this when dumping an executable Lisp.  Otherwise
203        ;; worldload will make us lose when it clears the search lists.
204        (setf *old-cmucl-lib* (search-list "library:")))
205    
206    (if purify    (if purify
207        (purify :root-structures root-structures        (purify :root-structures root-structures
208                :environment-name environment-name)                :environment-name environment-name)

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

  ViewVC Help
Powered by ViewVC 1.1.5