Remove support for Gentoo subversion-ebuild installed llvm-gcc libstdc++

headers. As llvm-gcc is dead, and I have no idea if this ever really
worked, I think it's time for it to go. More importantly, it makes it
harder to generalize the include search logic. If someone really wants
these to work, they can set the CPLUS_INCLUDE_PATH environment variable.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143836 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index bfdd7196d0b37aa3898a9c377acfbd139312feb0..7aaa7db48854a39fa7e722eb7cbcab4fa4b2e6fe 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -2334,10 +2334,6 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
   AddLibStdCXXIncludePaths(
     "/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
     "i686-pc-linux-gnu", "", "", Triple, DriverArgs, CC1Args);
-  // Gentoo x86 llvm-gcc trunk
-  AddLibStdCXXIncludePaths(
-    "/usr/lib/llvm-gcc-4.2-9999/include/c++/4.2.1",
-    "i686-pc-linux-gnu", "", "", Triple, DriverArgs, CC1Args);
 
   // Gentoo amd64 gcc 4.5.3
   AddLibStdCXXIncludePaths(
@@ -2371,11 +2367,6 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
   AddLibStdCXXIncludePaths(
     "/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/include/g++-v4",
     "x86_64-pc-linux-gnu", "", "", Triple, DriverArgs, CC1Args);
-
-  // Gentoo amd64 llvm-gcc trunk
-  AddLibStdCXXIncludePaths(
-    "/usr/lib/llvm-gcc-4.2-9999/include/c++/4.2.1",
-    "x86_64-pc-linux-gnu", "", "", Triple, DriverArgs, CC1Args);
 }
 
 /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly.