[cfe-commits] r143836 - /cfe/trunk/lib/Driver/ToolChains.cpp

[Chandler Carruth]

Author: chandlerc
Date: Sat Nov  5 16:26:18 2011
New Revision: 143836

URL: http://llvm.org/viewvc/llvm-project?rev=143836&view=rev
Log:
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.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=143836&r1=143835&r2=143836&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Sat Nov  5 16:26:18 2011
@@ -2334,10 +2334,6 @@
   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 @@
   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.