Re: don't add -isysroot to compiler flags if already in $CC

[Peter O'Gorman]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Peter O'Gorman wrote:

|
|        -framework|-arch|-isysroot)
| -        prev=darwin_framework
| -        compiler_flags="$compiler_flags $arg"
| -     compile_command="$compile_command $arg"
| -     finalize_command="$finalize_command $arg"
| +     case " $CC " in
| +       *" ${arg} ${1} "* | *" ${arg}  ${1} "*) shift ;;
| +       *) compiler_flags="$compiler_flags $arg"
| +          compile_command="$compile_command $arg"
| +          finalize_command="$finalize_command $arg"
| +          prev=darwin_framework ;;
| +     esac
|          continue
| -        ;;
| +          ;;

Thanks for not shouting at me for this!

Here is a patch that has a slightly better chance of doing the right thing.

Peter
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Darwin)

iQCVAwUBQ5rfI7iDAg3OZTLPAQLnbAQAmrEkiff6iEJF9wok8MknN2KkRGJksyVd
Jgtzw4ASkYHoWvp5Z/rW1yAvuVM4See762sEzQ2SITpYZUuXmpkQzUGOGciVXpk8
pf3wWWaKESqOzsk/LrZRpjs/XvkJekn8pmF2ZrfceQfoSAFA9VtgyTdIDfSUYBzV
TM+hrta4kio=
=/VV/
-----END PGP SIGNATURE-----

Index: ChangeLog
2005-12-01  Peter O'Gorman  <address@hidden>

        * ltmain.in [darwin]: Don't add -framework. -arch, -isysroot
        to $compiler_flags if already in $CC with same arguments.

from  Marc Espie  <address@hidden>
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