This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via 9c3ae35db6bbd9ce82bc5479354d99f53c46e888 (commit)
from 9b00a3a6e7d231440029d8be120dff7faa15320e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9c3ae35db6bbd9ce82bc5479354d99f53c46e888
Author: Ralf Wildenhues <[EMAIL PROTECTED]>
Date: Tue Apr 22 21:43:06 2008 +0200
Fix regression over 1.5.26 with ccache $CC -all-static.
* libltdl/config/ltmain.m4sh (func_mode_link): Add
$link_static_flag to compile_command and link_command only
later, instead of right after a possible compiler wrapper.
* tests/static.at (ccache -all-static): New test.
* THANKS: Update.
Report by Richard Purdie.
Signed-off-by: Ralf Wildenhues <[EMAIL PROTECTED]>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++++++++
THANKS | 1 +
libltdl/config/ltmain.m4sh | 9 +++++----
tests/static.at | 23 +++++++++++++++++++++++
4 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2beeb45..d5d41b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-22 Ralf Wildenhues <[EMAIL PROTECTED]>
+
+ Fix regression over 1.5.26 with ccache $CC -all-static.
+ * libltdl/config/ltmain.m4sh (func_mode_link): Add
+ $link_static_flag to compile_command and link_command only
+ later, instead of right after a possible compiler wrapper.
+ * tests/static.at (ccache -all-static): New test.
+ * THANKS: Update.
+ Report by Richard Purdie.
+
2008-04-22 Andreas Schwab <[EMAIL PROTECTED]>
Ralf Wildenhues <[EMAIL PROTECTED]>
diff --git a/THANKS b/THANKS
index 808cef0..c6726c6 100644
--- a/THANKS
+++ b/THANKS
@@ -119,6 +119,7 @@
Rainer Orth [EMAIL PROTECTED]
Rainer Tammer [EMAIL PROTECTED]
Ralf Menzel [EMAIL PROTECTED]
+ Richard Purdie [EMAIL PROTECTED]
Robert Ãgren [EMAIL PROTECTED]
Roberto Bagnara [EMAIL PROTECTED]
Roland Mainz [EMAIL PROTECTED]
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index ff1e50d..ac334dc 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -3160,9 +3160,6 @@ func_mode_link ()
fi
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
- # See comment for -static flag below, for more details.
- func_append compile_command " $link_static_flag"
- func_append finalize_command " $link_static_flag"
fi
prefer_static_libs=yes
;;
@@ -3450,7 +3447,11 @@ func_mode_link ()
case $arg in
-all-static)
- # The effects of -all-static are defined in a previous loop.
+ if test -n "$link_static_flag"; then
+ # See comment for -static flag below, for more details.
+ func_append compile_command " $link_static_flag"
+ func_append finalize_command " $link_static_flag"
+ fi
continue
;;
diff --git a/tests/static.at b/tests/static.at
index 74b1c63..1a51d0d 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -352,3 +352,26 @@ for withdep in no yes; do
done
AT_CLEANUP
+
+
+AT_SETUP([ccache -all-static])
+
+AT_DATA([ccache],
+[[#! /bin/sh
+# poor man's ccache clone
+case $1 in
+-*) echo "bogus argument: $1" >&2; exit 1 ;;
+esac
+exec "$@"
+]])
+chmod +x ./ccache
+
+AT_DATA([a.c],
+[[int main(void) { return 0; }
+]])
+
+AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore])
+AT_CHECK([$LIBTOOL --mode=link --tag=CC ./ccache $CC $CFLAGS $LDFLAGS
-all-static a.$OBJEXT -o a],
+ [], [ignore])
+
+AT_CLEANUP
hooks/post-receive
--
GNU Libtool
