summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Chisnall <csdavec@swan.ac.uk>2012-04-10 11:49:50 +0000
committerDavid Chisnall <csdavec@swan.ac.uk>2012-04-10 11:49:50 +0000
commit3d127c79e8732e65eeac17223991583c69961809 (patch)
tree0a8cb9545d8d9ed31aeaf131db21e0297bdac606
parentbbec87205db4d63b95423fccaca53f09d34cb11b (diff)
downloadbcm5719-llvm-3d127c79e8732e65eeac17223991583c69961809.tar.gz
bcm5719-llvm-3d127c79e8732e65eeac17223991583c69961809.zip
Don't link lib[std]c++ when -nostdlib is specified (Solaris driver).
Patch by Dmitri Shubin! llvm-svn: 154392
-rw-r--r--clang/lib/Driver/Tools.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index ae5a9b9c7e3..fbf4f08d4c3 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -4429,11 +4429,11 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddAllArgs(CmdArgs, options::OPT_r);
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
- if (getToolChain().getDriver().CCCIsCXX)
- getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
if (!Args.hasArg(options::OPT_nostdlib) &&
!Args.hasArg(options::OPT_nodefaultlibs)) {
+ if (getToolChain().getDriver().CCCIsCXX)
+ getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
CmdArgs.push_back("-lgcc_s");
if (!Args.hasArg(options::OPT_shared)) {
CmdArgs.push_back("-lgcc");
OpenPOWER on IntegriCloud