[llvm-branch-commits] [cfe-branch] r143939 - in /cfe/branches/release_30: ./ lib/Driver/ToolChains.cpp

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:28:49 2011
New Revision: 143939

URL: http://llvm.org/viewvc/llvm-project?rev=143939&view=rev
Log:
Merging r143836:
------------------------------------------------------------------------
r143836 | chandlerc | 2011-11-05 14:26:18 -0700 (Sat, 05 Nov 2011) | 5 lines

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/branches/release_30/   (props changed)
    cfe/branches/release_30/lib/Driver/ToolChains.cpp

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:28:49 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChains.cpp?rev=143939&r1=143938&r2=143939&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChains.cpp Mon Nov  7 04:28:49 2011
@@ -2342,10 +2342,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(
@@ -2379,11 +2375,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.