From a5227839861df1d8ce975b237e2bbc25bf736a62 Mon Sep 17 00:00:00 2001 From: Peter O'Gorman Date: Tue, 13 Dec 2005 14:39:22 +0000 Subject: [PATCH] * ltmain.in [darwin]: Don't add -framework. -arch, -isysroot to $compiler_flags if already in $CC with same arguments. --- ChangeLog | 5 +++++ ltmain.in | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 924f3d969..d53960b44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-13 Peter O'Gorman + + * ltmain.in [darwin]: Don't add -framework. -arch, -isysroot + to $compiler_flags if already in $CC with same arguments. + 2005-12-07 Marc Espie * ltmain.in: Preserve both parts of `--tag TAG', for diff --git a/ltmain.in b/ltmain.in index 7fe51797c..1cac54161 100644 --- a/ltmain.in +++ b/ltmain.in @@ -1363,8 +1363,8 @@ EOF prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1429,12 +1429,16 @@ EOF ;; -framework|-arch|-isysroot) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) 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 -- 2.47.3