commit 49033207b75216a956f3dbf7d018fb3343a54ec1
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 22eda3232274e1f7dd13a3491658c9e5013507f6
parent 8c990274ae17cf7c56048ee453b0566515633b7f

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156502 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/ToolChains.cpp

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