aboutsummaryrefslogtreecommitdiff
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
commit84d1e6e443b90275539a4e5b2dd94ae63c5ff19a (patch)
tree5f055402d64f890e2955129a17b54d4cfca6bf95
parent4c00fcdf98d3d7c4cb47b64f8b770f8f4bff1357 (diff)
Driver: Fix thinkos that prevented Clang from picking the right deployment
target when both {MACOSX,IPHONEOS}_DEPLOYMENT_TARGET were set. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99055 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Driver/ToolChains.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 2f8d714504..105eab06af 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/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) {