33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
--- libtool-1.5.22/libtool.m4.multilib 2005-12-18 22:53:17.000000000 +0100
|
|
+++ libtool-1.5.22/libtool.m4 2006-06-08 11:12:46.000000000 +0200
|
|
@@ -1572,10 +1572,27 @@
|
|
# before this can be enabled.
|
|
hardcode_into_libs=yes
|
|
|
|
+ # find out which ABI we are using
|
|
+ libsuff=
|
|
+ case "$host_cpu" in
|
|
+ x86_64*|s390x*|powerpc64*)
|
|
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
+ if AC_TRY_EVAL(ac_compile); then
|
|
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
+ *64-bit*)
|
|
+ libsuff=64
|
|
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
+ ;;
|
|
+ esac
|
|
+ fi
|
|
+ rm -rf conftest*
|
|
+ ;;
|
|
+ esac
|
|
+
|
|
# 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
|
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
+ 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/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
|
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
fi
|
|
|
|
# We used to test for /lib/ld.so.1 and disable shared libraries on
|