[PATCH] D11808: Driver: Fix include and lib dirs when not using gcc under mingw

[Hans Wennborg via cfe-commits]

I'm OK with it if Richard gives owner's approval.

Cheers,
Hans

On Thu, Aug 13, 2015 at 8:27 PM, Martell Malone <martellmalone at gmail.com> wrote:
> Hi Hans,
>
> Is this bugfix something that can be merged into 3.7 ?
>
> Kind Regards
> Martell
>
> On Thu, Aug 13, 2015 at 4:42 PM, Martell Malone <martellmalone at gmail.com>
> wrote:
>>
>> This revision was automatically updated to reflect the committed changes.
>> Closed by commit rL244902: Driver: Fix include directories when not using
>> libgcc under mingw (authored by martell).
>>
>> Changed prior to commit:
>>   http://reviews.llvm.org/D11808?vs=32007&id=32062#toc
>>
>> Repository:
>>   rL LLVM
>>
>> http://reviews.llvm.org/D11808
>>
>> Files:
>>   cfe/trunk/lib/Driver/MinGWToolChain.cpp
>>
>> cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/include/.keep
>>   cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/include/.keep
>>   cfe/trunk/test/Driver/mingw.cpp
>>
>> Index: cfe/trunk/test/Driver/mingw.cpp
>> ===================================================================
>> --- cfe/trunk/test/Driver/mingw.cpp
>> +++ cfe/trunk/test/Driver/mingw.cpp
>> @@ -1,3 +1,8 @@
>> +// RUN: %clang -target i686-windows-gnu -c -###
>> --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s 2>&1 | FileCheck
>> -check-prefix=CHECK_MINGW_CLANG_TREE %s
>> +// CHECK_MINGW_CLANG_TREE:
>> "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
>> +// CHECK_MINGW_CLANG_TREE:
>> "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}include"
>> +
>> +
>>  // RUN: %clang -target i686-pc-windows-gnu -stdlib=libstdc++ -c -###
>> --sysroot=%S/Inputs/mingw_mingw_org_tree/mingw %s 2>&1 | FileCheck
>> -check-prefix=CHECK_MINGW_ORG_TREE %s
>>  // CHECK_MINGW_ORG_TREE:
>> "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++"
>>  // CHECK_MINGW_ORG_TREE:
>> "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32"
>> Index: cfe/trunk/lib/Driver/MinGWToolChain.cpp
>> ===================================================================
>> --- cfe/trunk/lib/Driver/MinGWToolChain.cpp
>> +++ cfe/trunk/lib/Driver/MinGWToolChain.cpp
>> @@ -47,7 +47,7 @@
>>    Archs.emplace_back(getTriple().getArchName());
>>    Archs[0] += "-w64-mingw32";
>>    Archs.emplace_back("mingw32");
>> -  Arch = "unknown";
>> +  Arch = Archs[0].str();
>>    // lib: Arch Linux, Ubuntu, Windows
>>    // lib64: openSUSE Linux
>>    for (StringRef CandidateLib : {"lib", "lib64"}) {
>>
>>
>