Changeset 10276


Ignore:
Timestamp:
Aug 2, 2008, 10:03:57 PM (11 years ago)
Author:
gb
Message:

Don't try to interpret (Cocoa, GNUStep) bundles in CCL-DIRECTORY.
(Just use env var if it's set, directory containing heap image
otherwise. Not sure if we can do truename when this runs in the
cold load, but should probably resolve links here.)

File:
1 edited

Legend:

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

    r9048 r10276  
    633633    (if dirpath
    634634      (native-to-directory-pathname dirpath)
    635       (let* ((directory-containing-heap-image
    636               (make-pathname :directory (pathname-directory (%realpath (heap-image-name)))))
    637              (rpath (merge-pathnames
    638                      #+darwinppc-target "../Resources/ccl/"
    639                      #+linux-target "Resources/ccl/"
    640                      directory-containing-heap-image)))
    641         (or (probe-file rpath)
    642             directory-containing-heap-image)))))
     635      (make-pathname :directory (pathname-directory (%realpath (heap-image-name)))))))
    643636
    644637
Note: See TracChangeset for help on using the changeset viewer.