Changeset 15355

Timestamp:

May 6, 2012, 10:54:09 AM (13 years ago)

Author:

Gary Byers

Message:

If a Darwin shared library is linked without the -install_name option,
ccl::soname-from-mach-header will return NIL; don't blindly clobber
shlib.soname in that case. (Non-toy libraries probably want to have
an "install_name", but we should handle the case where they don't.)

Fixes ticket:963 in the trunk.

File:

• trunk/source/level-0/l0-cfm-support.lisp (modified) (2 diffs)

trunk/source/level-0/l0-cfm-support.lisp

@@ -711 +711 @@
           (when (%simple-string= name shlibname 0 0 namelen shlibnamelen)
             (unless (shlib.base lib)
-              (setf (shlib.base lib) addr
-                    (shlib.soname lib) (soname-from-mach-header addr)))
+              (setf (shlib.base lib) addr)
+              (let* ((soname  (soname-from-mach-header addr)))
+                (when soname
+                  (setf (shlib.soname lib) soname))))
             (return lib))))))))
 
@@ -746 +748 @@
            (nameptr (ff-call *dyld-get-image-name* :unsigned-fullword i :address))
            (name (%get-cstring nameptr ))
-           (lib (%cons-shlib (soname-from-mach-header addr) name nil addr)))
+           (lib (%cons-shlib (or (soname-from-mach-header addr) name) name nil addr)))
       (setf (shlib.handle lib)
             (ff-call *dlopen-entry* :address nameptr :unsigned-fullword (logior #$RTLD_GLOBAL #$RTLD_NOLOAD)))