summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains.cpp
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2012-04-27 19:51:11 +0000
committerChad Rosier <mcrosier@apple.com>2012-04-27 19:51:11 +0000
commit98ab91c226fc8434c0046e1daccd0dac0d50e967 (patch)
treef3d4b202210ee218129f1f944033db9756325695 /clang/lib/Driver/ToolChains.cpp
parent27c3246169b818204cea1314174b8fcf625ff528 (diff)
downloadbcm5719-llvm-98ab91c226fc8434c0046e1daccd0dac0d50e967.tar.gz
bcm5719-llvm-98ab91c226fc8434c0046e1daccd0dac0d50e967.zip
[driver] Don't try to set the deployment target when there is no bound
architecture; this was happening for tools such as lipo and dsymutil. Also, if no -arch option has been specified, set the architecture based on the TC default. rdar://11329656 llvm-svn: 155730
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
-rw-r--r--clang/lib/Driver/ToolChains.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index b56add39717..c883e446dd2 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -956,7 +956,8 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args,
// Add an explicit version min argument for the deployment target. We do this
// after argument translation because -Xarch_ arguments may add a version min
// argument.
- AddDeploymentTarget(*DAL);
+ if (BoundArch)
+ AddDeploymentTarget(*DAL);
// Validate the C++ standard library choice.
CXXStdlibType Type = GetCXXStdlibType(*DAL);
OpenPOWER on IntegriCloud