From: Alexandre Oliva Date: Thu, 7 Feb 2002 19:54:36 +0000 (+0000) Subject: Reverted incorrect patch: X-Git-Tag: release-1-5~134 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2c0bd8adaaceb3f2bbb4934d73a0cb601f1cca6;p=thirdparty%2Flibtool.git Reverted incorrect patch: 2001-10-24 H.J. Lu * 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. --- diff --git a/ChangeLog b/ChangeLog index 20939b15c..556b6c424 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-02-07 Alexandre Oliva + + Reverted incorrect patch: + 2001-10-24 H.J. Lu + * 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. + 2002-01-30 Robert Boehne * libtool.m4 (LT_AC_PROG_SED): Removed a mysterious newline. diff --git a/libtool.m4 b/libtool.m4 index f914b181f..497f70889 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1949,7 +1949,6 @@ 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` ;; diff --git a/ltmain.in b/ltmain.in index 00082f58d..89ee68fe5 100644 --- a/ltmain.in +++ b/ltmain.in @@ -2990,13 +2990,6 @@ 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