From: David Chisnall <csdavec@swan.ac.uk>
Date: Tue, 10 Apr 2012 11:49:50 +0000 (+0000)
Subject: Don't link lib[std]c++ when -nostdlib is specified (Solaris driver).
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e58e6f9114e61f0e490b5dc1c4f20b23a30f12dc;p=clang

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

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");