commit 7b1fee1fe515b29b7f601bd73e3f3a0237fe0c7c
author Chad Rosier <mcrosier@apple.com> Wed May 09 18:55:57 2012 +0000
committer Chad Rosier <mcrosier@apple.com> Wed May 09 18:55:57 2012 +0000
tree ae76d582734e3463bd16d773c1a5acdf85cdeb94
parent bf8628e62f38f65e7eaf90f980b31f75b324231a

Roll logic into a single if statement, per David's suggestion.

llvm-svn: 156502

clang/lib/Driver/ToolChains.cpp

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 395d22e..40c4ae1 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -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
     //