* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]:

Ignore lines in ld.so.conf starting with 'hwcap '.
This commit is contained in:
Ralf Wildenhues 2007-07-22 08:55:11 +00:00
parent 3c72a3a00d
commit b3251f4d7e
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2007-07-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]:
Ignore lines in ld.so.conf starting with 'hwcap '.
2007-07-16 Charles Wilson <libtool@cwilson.fastmail.fm>
* tests/cdemo-exec.test: use $EXEEXT where appropriate

View File

@ -2342,7 +2342,7 @@ linux* | k*bsd*-gnu)
# 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/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
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"
fi