diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-05-09 18:55:57 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-05-09 18:55:57 +0000 |
| commit | 7b1fee1fe515b29b7f601bd73e3f3a0237fe0c7c (patch) | |
| tree | ae76d582734e3463bd16d773c1a5acdf85cdeb94 | |
| parent | bf8628e62f38f65e7eaf90f980b31f75b324231a (diff) | |
| download | bcm5719-llvm-7b1fee1fe515b29b7f601bd73e3f3a0237fe0c7c.tar.gz bcm5719-llvm-7b1fee1fe515b29b7f601bd73e3f3a0237fe0c7c.zip | |
Roll logic into a single if statement, per David's suggestion.
llvm-svn: 156502
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 395d22ec6b7..40c4ae1e5fa 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/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 // |
