summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains/CrossWindows.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2017-07-25 18:02:57 +0000
committerNico Weber <nicolasweber@gmx.de>2017-07-25 18:02:57 +0000
commit0ee47d92b20019bed49841f93df1b5e4635061fc (patch)
tree67cbe70e812fd13f4bd7dbd5123894c0ce84607b /clang/lib/Driver/ToolChains/CrossWindows.cpp
parentf5ecb5e1b41f73868373bddc9fc0c6ebeecae5b5 (diff)
downloadbcm5719-llvm-0ee47d92b20019bed49841f93df1b5e4635061fc.tar.gz
bcm5719-llvm-0ee47d92b20019bed49841f93df1b5e4635061fc.zip
Introduce -nostdlib++ flag to disable linking the C++ standard library.
Projects that want to statically link their own C++ standard library currently need to pass -nostdlib or -nodefaultlibs, which also disables linking of the builtins library, -lm, and so on. Alternatively, they could use `clang` instead of `clang++`, but that already disables implicit addition of -lm on some toolchains. Add a dedicated flag -nostdlib++ that disables just linking of libc++ / libstdc++. This is analogous to -nostdinc++. https://reviews.llvm.org/D35780 llvm-svn: 308997
Diffstat (limited to 'clang/lib/Driver/ToolChains/CrossWindows.cpp')
-rw-r--r--clang/lib/Driver/ToolChains/CrossWindows.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains/CrossWindows.cpp b/clang/lib/Driver/ToolChains/CrossWindows.cpp
index 7d0c438b136..ac00a3eba83 100644
--- a/clang/lib/Driver/ToolChains/CrossWindows.cpp
+++ b/clang/lib/Driver/ToolChains/CrossWindows.cpp
@@ -160,8 +160,7 @@ void tools::CrossWindows::Linker::ConstructJob(
TC.AddFilePathLibArgs(Args, CmdArgs);
AddLinkerInputs(TC, Inputs, Args, CmdArgs, JA);
- if (D.CCCIsCXX() && !Args.hasArg(options::OPT_nostdlib) &&
- !Args.hasArg(options::OPT_nodefaultlibs)) {
+ if (TC.ShouldLinkCXXStdlib(Args)) {
bool StaticCXX = Args.hasArg(options::OPT_static_libstdcxx) &&
!Args.hasArg(options::OPT_static);
if (StaticCXX)
OpenPOWER on IntegriCloud