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

[Chad Rosier]

Author: mcrosier
Date: Wed May  9 13:55:57 2012
New Revision: 156502

URL: http://llvm.org/viewvc/llvm-project?rev=156502&view=rev
Log:
Roll logic into a single if statement, per David's suggestion.

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=156502&r1=156501&r2=156502&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Wed May  9 13:55:57 2012
@@ -528,10 +528,9 @@
 
     // If no OSX or iOS target has been specified and we're compiling for armv7,
     // go ahead as assume we're targeting iOS.
-    if (OSXTarget.empty() && iOSTarget.empty())
-      if (getDarwinArchName(Args) == "armv7") {
+    if (OSXTarget.empty() && iOSTarget.empty() &&
+        getDarwinArchName(Args) == "armv7")
         iOSTarget = iOSVersionMin;
-      }
 
     // Handle conflicting deployment targets
     //