From 48f9994bdd9f7f1853782109595b1f80f50afcfa Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sat, 25 Sep 2010 18:10:05 +0000 Subject: [PATCH] Driver/Linux: Translate rewritten lib options back to standard -l form when using generic GCC tools. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@114793 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index ff4af221e3..0701c5fa7b 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1693,9 +1693,18 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA, if (II.isFilename()) CmdArgs.push_back(II.getFilename()); - else + else { + const Arg &A = II.getInputArg(); + + // Reverse translate some rewritten options. + if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx)) { + CmdArgs.push_back("-lstdc++"); + continue; + } + // Don't render as input, we need gcc to do the translations. - II.getInputArg().render(Args, CmdArgs); + A.render(Args, CmdArgs); + } } const char *GCCName = getToolChain().getDriver().getCCCGenericGCCName().c_str(); -- 2.50.1