summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Vasilevsky <thevas@mac.com>2002-05-02 20:38:18 +0000
committerRobert Boehne <rboehne@gnu.org>2002-05-02 20:38:18 +0000
commit9a3c2107e54a2065f96aa95bd9747bbaa9e7a4b3 (patch)
tree8cc74ce75ee71404c4127d9a4652fcdfba1d535e
parentb3b3c2e27a46aeb90baf41de25252ec2b5986071 (diff)
downloadlibtool-9a3c2107e54a2065f96aa95bd9747bbaa9e7a4b3.tar.gz
* ltmain.in: Remove convenience libraries from deplibs for Darwin.
-rw-r--r--ChangeLog3
-rw-r--r--ltmain.in11
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 38ec0633..ebc04e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2002-05-02 Dave Vasilevsky <thevas@mac.com>
+
+ * ltmain.in: Remove convenience libraries from deplibs for Darwin.
2002-05-02 Fritz Elfert <felfert@to.com>
* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Modify archive_expsym_cmds
diff --git a/ltmain.in b/ltmain.in
index 58214f85..c6865f44 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -3300,7 +3300,18 @@ EOF
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ save_deplibs="$deplibs"
+ for conv in $convenience; do
+ tmp_deplibs=
+ for test_deplib in $deplibs; do
+ if test "$test_deplib" != "$conv"; then
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ fi
+ done
+ deplibs="$tmp_deplibs"
+ done
eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
if len=`expr "X$cmds" : ".*"` &&