[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: don't add -isysroot to compiler flags if already in $CC
From: |
Peter O'Gorman |
Subject: |
Re: don't add -isysroot to compiler flags if already in $CC |
Date: |
Fri, 09 Dec 2005 22:10:43 +0900 |
User-agent: |
Mozilla Thunderbird 1.0.2 (Macintosh/20050317) |
Next attempt :)
Okay for the stable branch?
Peter
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 9 Dec 2005 13:09:23 -0000
@@ -1429,12 +1429,15 @@ EOF
;;
-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
- ;;
+ ;;
-inst-prefix-dir)
prev=inst_prefix