maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 156502
This commit is contained in:
Chad Rosier 2012-05-09 18:55:57 +00:00
parent bf8628e62f
commit 7b1fee1fe5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Driver/ToolChains.cpp
View File

@ -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
//