summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains.cpp
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-03-20 08:47:42 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-03-20 08:47:42 +0000
commite543a5e684d70ab4b02cf5b27efe22ea3b84b9dc (patch)
treed3080b16ca984a25403e74326e0571941e5b01d6 /clang/lib/Driver/ToolChains.cpp
parent6a8efa8a79e7c74e31605ae6038c3cc79a3ef041 (diff)
downloadbcm5719-llvm-e543a5e684d70ab4b02cf5b27efe22ea3b84b9dc.tar.gz
bcm5719-llvm-e543a5e684d70ab4b02cf5b27efe22ea3b84b9dc.zip
Driver: Fix thinkos that prevented Clang from picking the right deployment
target when both {MACOSX,IPHONEOS}_DEPLOYMENT_TARGET were set. llvm-svn: 99055
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
-rw-r--r--clang/lib/Driver/ToolChains.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 2f8d714504b..105eab06af5 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -394,9 +394,9 @@ DerivedArgList *Darwin::TranslateArgs(InputArgList &Args,
// this. Perhaps put under -pedantic?
if (getTriple().getArch() == llvm::Triple::arm ||
getTriple().getArch() == llvm::Triple::thumb)
- OSXVersion = 0;
+ OSXTarget = 0;
else
- iPhoneVersion = 0;
+ iPhoneOSTarget = 0;
}
if (OSXTarget) {
OpenPOWER on IntegriCloud