diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index c35ad7c..7a77d56 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2595,6 +2595,10 @@
     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 =