diff options
author | David Chisnall <csdavec@swan.ac.uk> | 2012-04-10 11:49:50 +0000 |
---|---|---|
committer | David Chisnall <csdavec@swan.ac.uk> | 2012-04-10 11:49:50 +0000 |
commit | e58e6f9114e61f0e490b5dc1c4f20b23a30f12dc (patch) | |
tree | 21679b2d7ab8098d2992fb48994c5ba62198348d /lib/Driver/Tools.cpp | |
parent | e9b4d98f97de6657d4ff77478ba69730f08b9b81 (diff) |
Don't link lib[std]c++ when -nostdlib is specified (Solaris driver).
Patch by Dmitri Shubin!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154392 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
-rw-r--r-- | lib/Driver/Tools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index ae5a9b9c7e..fbf4f08d4c 100644 --- a/lib/Driver/Tools.cpp +++ b/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"); |