diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-11-30 08:37:18 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2016-02-19 10:21:15 +0100 |
| commit | d7c8d3b43fef8641f4354edaa0429d157259bf56 (patch) | |
| tree | 09e151d1103497c7fc969a38a8e6101ef4cf248e | |
| parent | 807cbd63abbd467c220579de0b0113ec8155e697 (diff) | |
| download | libtool-d7c8d3b43fef8641f4354edaa0429d157259bf56.tar.gz | |
m4/libtool.m4: FreeBSD elftoolchain strip support
References:
http://savannah.gnu.org/patch/?8675
Message-Id: <20150523-002056.sv85487.59958@savannah.gnu.org>
* m4/libtool.m4 (_LT_CMD_STRIPLIB): Remove the redundant tests for
empty $old_striplib and $striplib. Move the test for empty $STRIP
variable up. Allow elftoolchain strip (with the same arguments we
used to have with GNU strip) on FreeBSD.
| -rw-r--r-- | NO-THANKS | 2 | ||||
| -rw-r--r-- | m4/libtool.m4 | 39 |
2 files changed, 26 insertions, 15 deletions
@@ -37,6 +37,7 @@ Bruno Haible haible@ilog.fr Dalibor Topic robilad@kaffe.org David Edelsohn edelsohn@gnu.org DJ Delorie dj@delorie.com +Ed Maste emaste@freebsd.org Erez Zadok ezk@cs.columbia.edu Eric Blake ebb9@byu.net H.J. Lu hjl@gnu.org @@ -143,5 +144,6 @@ Ulrich Drepper drepper@ipd.info.uni-karlsruhe.de Václav Zeman vhaisman@gmail.com Warren Dodge warren.l.dodge@Tektronix.com Xavier Pianet xavier@xingo.com +Xin Li Юрий Андреевич Пухальский pooh@cryptopro.ru Дилян Палаузов dilyan.palauzov@aegee.org diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 53b404f5..1a5f65bc 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2220,26 +2220,35 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) |