* config/ltmain.m4sh (inherited_linker_flags): Work when output

is an application too.
Reported by Christopher Egger <Christoph_Egger@gmx.de>
This commit is contained in:
Peter O'Gorman 2005-08-08 10:45:19 +00:00 committed by Ralf Wildenhues
parent eb28eed82d
commit 2ca6ca80aa
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2005-08-08 Peter O'Gorman <peter@pogma.com>
* config/ltmain.m4sh (inherited_linker_flags): Work when output
is an application too.
Reported by Christopher Egger <Christoph_Egger@gmx.de>
2005-08-08 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* m4/libtool.m4 (_LT_PROG_FC, _LT_LANG_FC_CONFIG): New macros

View File

@ -3376,14 +3376,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