Fix passing stdc++ correctly in the FreeBSD toolchain support, Credit to Roman Divacky.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@89205 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 34154f3..e0af3bc 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2609,6 +2609,8 @@
// FIXME: For some reason GCC passes -lgcc and -lgcc_s before adding
// the default system libraries. Just mimic this for now.
CmdArgs.push_back("-lgcc");
+ if (D.CCCIsCXX)
+ CmdArgs.push_back("-lstdc++");
if (Args.hasArg(options::OPT_static)) {
CmdArgs.push_back("-lgcc_eh");
} else {
@@ -2638,10 +2640,6 @@
else
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtendS.o")));
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtn.o")));
- // FIXME: g++ is more complicated here, it tries to put -lstdc++
- // before -lm, for example.
- if (D.CCCIsCXX)
- CmdArgs.push_back("-lstdc++");
}
const char *Exec =