diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 4ae96c2..487e5c8 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1481,6 +1481,11 @@
   
   if (!Args.hasArg(options::OPT_nostdlib) &&
       !Args.hasArg(options::OPT_nodefaultlibs)) {
+    // FIXME: g++ is more complicated here, it tries to put -lstdc++
+    // before -lm, for example.
+    if (getToolChain().getHost().getDriver().CCCIsCXX)
+      CmdArgs.push_back("-lstdc++");
+
     // link_ssp spec is empty.
 
     // Derived from libgcc and lib specs but refactored.