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

[Chandler Carruth]

On Wed, Sep 12, 2012 at 10:53 PM, NAKAMURA Takumi <geek4civic at gmail.com>wrote:

> Author: chapuni
> Date: Thu Sep 13 00:53:23 2012
> New Revision: 163776
>
> URL: http://llvm.org/viewvc/llvm-project?rev=163776&view=rev
> Log:
> InitHeaderSearch.cpp: [mingw] Handle DOSish paths only on Win32 hosts.
>

No, this is completely wrong. The set of paths to search for headers should
never have anything to do with the *host*, only the *target*. Please revert
this and let's actually talk about the problem you're solving here.

If you're trying to clean up the mingw header search, please as a first
step let's move it to the Driver.


>
> 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=163776&r1=163775&r2=163776&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
> +++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Thu Sep 13 00:53:23 2012
> @@ -320,7 +320,9 @@
>        P.appendComponent("../../../include"); // <sysroot>/include
>        AddPath(P.str(), System, true, false, false);
>        AddPath("/mingw/include", System, true, false, false);
> +#if defined(_WIN32)
>        AddPath("c:/mingw/include", System, true, false, false);
> +#endif
>      }
>      break;
>
> @@ -396,12 +398,14 @@
>      AddMinGW64CXXPaths(HSOpts.ResourceDir, "4.7.0");
>      // mingw.org C++ include paths
>      AddMinGWCPlusPlusIncludePaths("/mingw/lib/gcc", "mingw32", "4.5.2");
> //MSYS
> +#if defined(_WIN32)
>      AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.6.2");
>      AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.6.1");
>      AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.5.2");
>      AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.5.0");
>      AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.4.0");
>      AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.3.0");
> +#endif
>      break;
>    case llvm::Triple::DragonFly:
>      AddPath("/usr/include/c++/4.1", CXXSystem, true, false, false);
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20120912/879df8e2/attachment.html>