From 69e337ff6afd10fcdfe5def746d839d303298be4 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 7 Nov 2011 10:28:49 +0000 Subject: 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. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_30@143939 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index ab2839e8e0..b4aee5f71b 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -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. -- cgit v1.2.3