diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2014-12-04 17:44:41 +0000 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2014-12-04 17:44:41 +0000 |
| commit | 8727e07a166f6822751a4d719fff9a1094ce1619 (patch) | |
| tree | 6e3f9d7c701638addca10c3ff1ef6190f503435b /m4 | |
| parent | 9f52eb3d6c69d1cecf8f938ba0be3e7171404261 (diff) | |
| download | libtool-8727e07a166f6822751a4d719fff9a1094ce1619.tar.gz | |
libtool: for 64bit GNU arches, add /lib64 and /usr/lib64 to sys_lib_dlsearch_path.
* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) <linux*, k*bsd*-gnu>
<kopensolaris*-gnu, gnu*>: If $host_cpu contains "64", add /lib64
and /usr/lib64 to sys_lib_dlsearch_path_spec.
Reported by Orion Poplawski, Christian Rössel, Olly Betts et. al.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libtool.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 2bbf01b1..fd4dfb40 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2796,6 +2796,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi + # Ideally we could use /sbin/ldconfig to report what directories are + # searched, but (aside from not being certain /sbin/ldconfig is + # available) Fedora on 64bit does not report /usr/lib64, even though + # it is searched at run-time. + case $host_cpu in + # match at least x86_64, ia64, powerpc64* + *64*) sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 $sys_lib_dlsearch_path_spec" ;; + esac # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the |