[cfe-commits] r127582 - /cfe/trunk/lib/Frontend/InitHeaderSearch.cpp

[Douglas Gregor]

Bill, please pull this into the 2.9 branch.

	Thanks!
	- Doug

On Mar 14, 2011, at 8:33 AM, Douglas Gregor wrote:

> Author: dgregor
> Date: Mon Mar 14 10:33:44 2011
> New Revision: 127582
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=127582&view=rev
> Log:
> Add include paths for Gentoo Linux, from Marcin Mirosław!
> 
> Modified:
>    cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
> 
> Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=127582&r1=127581&r2=127582&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
> +++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Mon Mar 14 10:33:44 2011
> @@ -741,7 +741,19 @@
>                                 "i686-pc-linux-gnu", "", "", triple);
>     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
>                                 "x86_64-unknown-linux-gnu", "", "", triple);
> -    // Gentoo x86 2010.0 stable
> +    // Gentoo x86 gcc 4.5.2
> +    AddGnuCPlusPlusIncludePaths(
> +      "/usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include/g++-v4",
> +      "i686-pc-linux-gnu", "", "", triple);
> +    // Gentoo x86 gcc 4.4.5
> +    AddGnuCPlusPlusIncludePaths(
> +      "/usr/lib/gcc/i686-pc-linux-gnu/4.4.5/include/g++-v4",
> +      "i686-pc-linux-gnu", "", "", triple);
> +    // Gentoo x86 gcc 4.4.4
> +    AddGnuCPlusPlusIncludePaths(
> +      "/usr/lib/gcc/i686-pc-linux-gnu/4.4.4/include/g++-v4",
> +      "i686-pc-linux-gnu", "", "", triple);
> +   // Gentoo x86 2010.0 stable
>     AddGnuCPlusPlusIncludePaths(
>       "/usr/lib/gcc/i686-pc-linux-gnu/4.4.3/include/g++-v4",
>       "i686-pc-linux-gnu", "", "", triple);
> @@ -757,7 +769,15 @@
>     AddGnuCPlusPlusIncludePaths(
>       "/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
>       "i686-pc-linux-gnu", "", "", triple);
> +    // Gentoo x86 llvm-gcc trunk
> +    AddGnuCPlusPlusIncludePaths(
> +        "/usr/lib/llvm-gcc-4.2-9999/include/c++/4.2.1",
> +        "i686-pc-linux-gnu", "", "", triple);
> 
> +    // Gentoo amd64 gcc 4.5.2
> +    AddGnuCPlusPlusIncludePaths(
> +        "/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.2/include/g++-v4",
> +        "x86_64-pc-linux-gnu", "32", "", triple);
>     // Gentoo amd64 gcc 4.4.5
>     AddGnuCPlusPlusIncludePaths(
>         "/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/include/g++-v4",
> @@ -777,7 +797,7 @@
>     // Gentoo amd64 stable
>     AddGnuCPlusPlusIncludePaths(
>         "/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/include/g++-v4",
> -        "i686-pc-linux-gnu", "", "", triple);
> +        "x86_64-pc-linux-gnu", "", "", triple);
> 
>     // Gentoo amd64 llvm-gcc trunk
>     AddGnuCPlusPlusIncludePaths(
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits