42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
This reverts upstream commit caf606c90d55305967b9253447dda93d2f1835ab
|
|
until https://sourceware.org/PR29547 is fixed.
|
|
|
|
--- a/libtool.m4
|
|
+++ b/libtool.m4
|
|
@@ -3214,31 +3214,25 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
|
|
lt_nm_to_check="$lt_nm_to_check nm"
|
|
fi
|
|
fi
|
|
- for lt_tmp_nm in "$lt_nm_to_check"; do
|
|
+ for lt_tmp_nm in $lt_nm_to_check; do
|
|
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
|
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
|
|
IFS="$lt_save_ifs"
|
|
test -z "$ac_dir" && ac_dir=.
|
|
- # Strip out any user-provided options from the nm to test twice,
|
|
- # the first time to test to see if nm (rather than its options) has
|
|
- # an explicit path, the second time to yield a file which can be
|
|
- # nm'ed itself.
|
|
- tmp_nm_path="`$ECHO "$lt_tmp_nm" | sed 's, -.*$,,'`"
|
|
- case "$tmp_nm_path" in
|
|
+ case "$lt_tmp_nm" in
|
|
*/*|*\\*) tmp_nm="$lt_tmp_nm";;
|
|
*) tmp_nm="$ac_dir/$lt_tmp_nm";;
|
|
esac
|
|
- tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
|
|
- if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
|
|
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
|
|
# Check to see if the nm accepts a BSD-compat flag.
|
|
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
|
# nm: unknown option "B" ignored
|
|
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
|
+ case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
|
*$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
|
break
|
|
;;
|
|
*)
|
|
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
|
+ case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
|
*$tmp_nm*)
|
|
lt_cv_path_NM="$tmp_nm -p"
|
|
break
|