From: Daniel Dunbar <daniel@zuster.org>
Date: Sat, 20 Mar 2010 08:47:42 +0000 (+0000)
Subject: Driver: Fix thinkos that prevented Clang from picking the right deployment
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84d1e6e443b90275539a4e5b2dd94ae63c5ff19a;p=clang

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
---

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) {