From: Dave Vasilevsky <thevas@mac.com>
Date: Thu, 2 May 2002 20:38:11 +0000 (+0000)
Subject: * ltmain.in: Remove convenience libraries from deplibs for Darwin.
X-Git-Tag: release-1-5~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b689a89ced0f8169f8e0d0c6706944b0ade4063;p=thirdparty%2Flibtool.git

* ltmain.in: Remove convenience libraries from deplibs for Darwin.
---

diff --git a/ChangeLog b/ChangeLog
index 42585536a..81fe700ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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 58214f858..c6865f442 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" : ".*"` &&