From 49033207b75216a956f3dbf7d018fb3343a54ec1 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Wed, 9 May 2012 18:55:57 +0000 Subject: [PATCH] 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 395d22ec6b..40c4ae1e5f 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -528,10 +528,9 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const { // 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 // -- 2.40.0