Changeset 7469


Ignore:
Timestamp:
Oct 18, 2007, 3:01:21 PM (14 years ago)
Author:
gz
Message:

make ccl-directory compute the heap image name rather than relying on
*heap-image-name*, which might still have a stale value. This fixes
a bug in initializing "ccl:" for the command line version.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/level-1/l1-pathnames.lisp

    r7455 r7469  
    2424(in-package "CCL")
    2525
    26 (defloadvar *heap-image-name*
    27     (let* ((p (%null-ptr)))
    28       (declare (dynamic-extent p))
    29       (%get-cstring (%get-kernel-global-ptr 'image-name p))))
     26(defun heap-image-name ()
     27  (let* ((p (%null-ptr)))
     28    (declare (dynamic-extent p))
     29    (%get-cstring (%get-kernel-global-ptr 'image-name p))))
     30
     31(defloadvar *heap-image-name* (heap-image-name))
    3032
    3133(defloadvar *command-line-argument-list*
     
    629631      (native-to-directory-pathname dirpath)
    630632      (let* ((directory-containing-heap-image
    631               (make-pathname :directory (pathname-directory (%realpath *heap-image-name*))))
     633              (make-pathname :directory (pathname-directory (%realpath (heap-image-name)))))
    632634             (rpath (merge-pathnames
    633635                     #+darwinppc-target "../Resources/ccl/"
Note: See TracChangeset for help on using the changeset viewer.