[cfe-commits] r99055 - /cfe/trunk/lib/Driver/ToolChains.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Sat Mar 20 03:47:42 2010
New Revision: 99055

URL: http://llvm.org/viewvc/llvm-project?rev=99055&view=rev
Log:
Driver: Fix thinkos that prevented Clang from picking the right deployment
target when both {MACOSX,IPHONEOS}_DEPLOYMENT_TARGET were set.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=99055&r1=99054&r2=99055&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Sat Mar 20 03:47:42 2010
@@ -394,9 +394,9 @@
       // 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) {