From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 8 Aug 2005 12:05:37 +0000 (+0000)
Subject: * config/ltmain.m4sh (inherited_linker_flags): Backed out broken
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ed78a260fbabe0cb5692d49dc9a9fc31efab6fc;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (inherited_linker_flags): Backed out broken
patch.
---

diff --git a/ChangeLog b/ChangeLog
index 5833050a9..7c5b7d477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config/ltmain.m4sh (inherited_linker_flags): Backed out broken
+	patch.
+
 2005-08-08  Peter O'Gorman  <peter@pogma.com>
 
 	* config/ltmain.m4sh (inherited_linker_flags): Work when output
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index a928f7b20..6f3c610f9 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -3376,19 +3376,14 @@ func_mode_link ()
 	  # Convert "-framework foo" to "foo.ltframework"
 	  if test -n "$inherited_linker_flags"; then
 	    tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([[^ $]]*\)/\1.ltframework/g'`
-		for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-		  case " $new_inherited_linker_flags " in
-		    *" tmp_inherited_linker_flag "*) ;;
-		    *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flags";;
-		  esac
-		done
+	    new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flags"
 	  fi
 	  dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([[^ $]]*\).ltframework% -framework \1%g'`
 	  ;;
 	esac
 	if test "$linkmode,$pass" = "prog,link"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	  compile_deplibs="$inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$inherited_linker_flags $finalize_deplibs"
 	else
 	  compiler_flags="$compiler_flags $inherited_linker_flags"
 	fi