Hi Peter,
* Peter O'Gorman wrote on Sat, Dec 10, 2005 at 02:58:59PM CET:
> Peter O'Gorman wrote:
*snip*
>
> Thanks for not shouting at me for this!
I haven't even looked at it yet.. ;-)
> Here is a patch that has a slightly better chance of doing the right
> thing.
Looks good, although for looks you could s/_xx/_skip/.
Thank you!
Ralf
> 2005-12-01 Peter O'Gorman <[EMAIL PROTECTED]>
>
> * ltmain.in [darwin]: Don't add -framework. -arch, -isysroot
> to $compiler_flags if already in $CC with same arguments.
>
> from Marc Espie <[EMAIL PROTECTED]>
> Index: ltmain.in
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
> retrieving revision 1.334.2.109
> diff -u -3 -p -u -r1.334.2.109 ltmain.in
> --- ltmain.in 7 Dec 2005 20:54:16 -0000 1.334.2.109
> +++ ltmain.in 10 Dec 2005 13:53:55 -0000
> @@ -1363,8 +1363,8 @@ EOF
> prev=
> continue
> ;;
> - darwin_framework)
> - compiler_flags="$compiler_flags $arg"
> + darwin_framework|darwin_framework_xx)
> + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags
> $arg"
> compile_command="$compile_command $arg"
> finalize_command="$finalize_command $arg"
> prev=
> @@ -1429,12 +1429,15 @@ EOF
> ;;
>
> -framework|-arch|-isysroot)
> - prev=darwin_framework
> - compiler_flags="$compiler_flags $arg"
> + case " $CC " in
> + *" ${arg} ${1} "* | *" ${arg} ${1} "*) prev=darwin_framework_xx ;;
> + *) compiler_flags="$compiler_flags $arg"
> + prev=darwin_framework ;;
> + esac
> compile_command="$compile_command $arg"
> finalize_command="$finalize_command $arg"
> - continue
> - ;;
> + continue
> + ;;
>
> -inst-prefix-dir)
> prev=inst_prefix
