Commit 246dabac authored by Chandler Carruth's avatar Chandler Carruth
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 143939
parent 5fe100a8

clang/lib/Driver/ToolChains.cpp

+0 −9
Original line number Diff line number Diff line
@@ -2342,10 +2342,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(
@@ -2379,11 +2375,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.