Index: ToolChains.cpp
===================================================================
--- ToolChains.cpp	(revision 168589)
+++ ToolChains.cpp	(working copy)
@@ -2409,6 +2409,11 @@
             DriverArgs, CC1Args))
       break;
   }
+  // Ubuntu puts the config file for GCC 4.7 in a target subdirectory
+  std::string TripleIncludeCandidate =
+    LibDir.str() + "/../include/" + TripleStr.str() + "/c++/" + Version.str();
+  addLibStdCXXIncludePaths(TripleIncludeCandidate,
+    (TripleStr + GCCInstallation.getMultiarchSuffix()), DriverArgs, CC1Args);
 }
 
 /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly.