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

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

diff --git a/ChangeLog b/ChangeLog
index 09d72581a..2ed58b390 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 190931afb..13eacfc54 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2940,7 +2940,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
 	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do