26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
--- libtool-1.5.24_patched/libtool.m4.multilib 2007-07-10 14:39:32.000000000 +0200
|
|
+++ libtool-1.5.24_patched/libtool.m4 2007-07-10 14:48:00.000000000 +0200
|
|
@@ -559,6 +559,7 @@ s390*-*linux*|sparc*-*linux*)
|
|
esac
|
|
;;
|
|
*64-bit*)
|
|
+ libsuff=64
|
|
case $host in
|
|
x86_64-*kfreebsd*-gnu)
|
|
LD="${LD-ld} -m elf_x86_64_fbsd"
|
|
@@ -1617,11 +1618,13 @@ linux* | k*bsd*-gnu)
|
|
# Some rework will be needed to allow for fast_install
|
|
# before this can be enabled.
|
|
hardcode_into_libs=yes
|
|
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
|
|
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
|
|
|
|
# Append ld.so.conf contents to the search path
|
|
if test -f /etc/ld.so.conf; then
|
|
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;/^$/d' | tr '\n' ' '`
|
|
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
|
fi
|
|
|
|
# We used to test for /lib/ld.so.1 and disable shared libraries on
|