[cfe-commits] [PATCH 4/4][clang] lib/Frontend/InitHeaderSearch.cpp: Add mingw-w64's include paths.

NAKAMURA Takumi geek4civic at gmail.com
Tue Feb 15 20:11:10 PST 2011


Hello Duncan,

On Tue, Feb 15, 2011 at 7:37 PM, Duncan Sands <baldrick at free.fr> wrote:
>> --- a/lib/Frontend/InitHeaderSearch.cpp
>> +++ b/lib/Frontend/InitHeaderSearch.cpp
>> @@ -566,6 +566,14 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple
>> &triple) {
>>     AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin",
>> "3.4.4");
>>     break;
>>   case llvm::Triple::MinGW:
>> +    // mingw-w64-20110207
>> +    AddPath("c:/MinGW/include/c++/4.5.3", System, true, false, false);
>> +    AddPath("c:/MinGW/include/c++/4.5.3/x86_64-w64-mingw32", System,
>> true, false, false);
>> +    AddPath("c:/MinGW/include/c++/4.5.3/backward", System, true, false,
>> false);
>> +    // mingw-w64-20101129
>> +    AddPath("c:/MinGW/include/c++/4.5.2", System, true, false, false);
>> +    AddPath("c:/MinGW/include/c++/4.5.2/x86_64-w64-mingw32", System,
>> true, false, false);
>> +    AddPath("c:/MinGW/include/c++/4.5.2/backward", System, true, false,
>> false);
>>     // Try gcc 4.5.0
>>     AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.5.0");
>>     // Try gcc 4.4.0
>
> shouldn't you only add these paths if the triple contained "w64"?

I assume, there, no applicable alternates would be supplied if we
didn't receive "x86_64-w64-mingw32".
Hard-coded paths would be purged when "Universal driver" came. :)
(and for mingw, I wish we could provide our libs and linker)

FIXME: I don't have yet GNU libstdc++ header who has
"include/c++/4.5.x/i686-w64-mingw32".

...Takumi




More information about the cfe-commits mailing list