mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* ltmain.sh: Allow link against an archive when building a
shared library. * libtool.m4 (lt_cv_deplibs_check_method): Always use file_magic for Linux ELF.
This commit is contained in:
parent
2046e10a30
commit
c6d8bb2c4b
@ -1,3 +1,10 @@
|
||||
2001-10-24 H.J. Lu <hjl@gnu.org>
|
||||
|
||||
* ltmain.sh: Allow link against an archive when building a
|
||||
shared library.
|
||||
* libtool.m4 (lt_cv_deplibs_check_method): Always use
|
||||
file_magic for Linux ELF.
|
||||
|
||||
2001-10-12 Guido Draheim <guidod-2001q3@gmx.de>
|
||||
|
||||
* ltdl.m4: Changed "underscode to underscore".
|
||||
|
1
libtool.m4
vendored
1
libtool.m4
vendored
@ -1944,6 +1944,7 @@ linux*)
|
||||
# glibc up to 2.1.1 does not perform some relocations on ARM
|
||||
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
|
||||
esac
|
||||
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
|
||||
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
|
||||
;;
|
||||
|
||||
|
@ -2973,6 +2973,13 @@ EOF
|
||||
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
|
||||
esac
|
||||
done
|
||||
# It is ok to link against an archive when
|
||||
# building a shared library.
|
||||
if $AR -t $potlib > /dev/null 2>&1; then
|
||||
newdeplibs="$newdeplibs $a_deplib"
|
||||
a_deplib=""
|
||||
break 2
|
||||
fi
|
||||
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
|
||||
| sed 10q \
|
||||
| egrep "$file_magic_regex" > /dev/null; then
|
||||
|
Loading…
Reference in New Issue
Block a user