From: Peter O'Gorman Date: Mon, 8 Aug 2005 10:44:45 +0000 (+0000) Subject: * config/ltmain.m4sh (inherited_linker_flags): Work when output X-Git-Tag: release-2-1b~592 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd94ca16825885f0deb61f19f7d9ebeae73d5f36;p=thirdparty%2Flibtool.git * config/ltmain.m4sh (inherited_linker_flags): Work when output is an application too. Reported by Christopher Egger --- diff --git a/ChangeLog b/ChangeLog index 4d6dc0941..c3cb1ec4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-08-08 Peter O'Gorman + + * config/ltmain.m4sh (inherited_linker_flags): Work when output + is an application too. + Reported by Christopher Egger + 2005-08-08 Ralf Wildenhues * m4/libtool.m4 (_LT_PROG_FC, _LT_LANG_FC_CONFIG): New macros diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh index 5205d0766..a8562de3b 100644 --- a/config/ltmain.m4sh +++ b/config/ltmain.m4sh @@ -3405,14 +3405,19 @@ 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'` - new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flags" + 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 fi dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([[^ $]]*\).ltframework% -framework \1%g'` ;; esac if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$inherited_linker_flags $compile_deplibs" - finalize_deplibs="$inherited_linker_flags $finalize_deplibs" + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags $inherited_linker_flags" fi