diff options
| author |   patrick <patrick@openbsd.org> | 2018-04-06 14:26:03 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2018-04-06 14:26:03 +0000 |
| commit | bdabc2f19ffb9e20600dad6e8a300842a7bda50e (patch) | |
| tree | c50e7b2e5449b074651bb82a58517a8ebc4a8cf7 /gnu/llvm/tools/clang/lib/Driver/ToolChains/NaCl.cpp | |
| parent | Print a 'p' flag for file descriptors that were opened after pledge(2). (diff) | |
| download | wireguard-openbsd-bdabc2f19ffb9e20600dad6e8a300842a7bda50e.tar.xz wireguard-openbsd-bdabc2f19ffb9e20600dad6e8a300842a7bda50e.zip | |
Import LLVM 6.0.1 release including clang, lld and lldb.
"where is the kaboom?" deraadt@
Diffstat (limited to 'gnu/llvm/tools/clang/lib/Driver/ToolChains/NaCl.cpp')
| -rw-r--r-- | gnu/llvm/tools/clang/lib/Driver/ToolChains/NaCl.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/llvm/tools/clang/lib/Driver/ToolChains/NaCl.cpp b/gnu/llvm/tools/clang/lib/Driver/ToolChains/NaCl.cpp index 5eb5c74f131..128478d6387 100644 --- a/gnu/llvm/tools/clang/lib/Driver/ToolChains/NaCl.cpp +++ b/gnu/llvm/tools/clang/lib/Driver/ToolChains/NaCl.cpp @@ -133,13 +133,15 @@ void nacltools::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (D.CCCIsCXX() && !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { - bool OnlyLibstdcxxStatic = - Args.hasArg(options::OPT_static_libstdcxx) && !IsStatic; - if (OnlyLibstdcxxStatic) - CmdArgs.push_back("-Bstatic"); - ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); - if (OnlyLibstdcxxStatic) - CmdArgs.push_back("-Bdynamic"); + if (ToolChain.ShouldLinkCXXStdlib(Args)) { + bool OnlyLibstdcxxStatic = + Args.hasArg(options::OPT_static_libstdcxx) && !IsStatic; + if (OnlyLibstdcxxStatic) + CmdArgs.push_back("-Bstatic"); + ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); + if (OnlyLibstdcxxStatic) + CmdArgs.push_back("-Bdynamic"); + } CmdArgs.push_back("-lm"); } |