<div dir="ltr">Hi Hans,<div><br></div><div>Is this bugfix something that can be merged into 3.7 ?</div><div><br></div><div>Kind Regards</div><div>Martell</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 13, 2015 at 4:42 PM, Martell Malone <span dir="ltr"><<a href="mailto:martellmalone@gmail.com" target="_blank">martellmalone@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This revision was automatically updated to reflect the committed changes.<br>
Closed by commit rL244902: Driver: Fix include directories when not using libgcc under mingw (authored by martell).<br>
<br>
Changed prior to commit:<br>
  <a href="http://reviews.llvm.org/D11808?vs=32007&id=32062#toc" rel="noreferrer" target="_blank">http://reviews.llvm.org/D11808?vs=32007&id=32062#toc</a><br>
<br>
Repository:<br>
  rL LLVM<br>
<br>
<a href="http://reviews.llvm.org/D11808" rel="noreferrer" target="_blank">http://reviews.llvm.org/D11808</a><br>
<br>
Files:<br>
  cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
  cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/include/.keep<br>
  cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/include/.keep<br>
  cfe/trunk/test/Driver/mingw.cpp<br>
<br>
Index: cfe/trunk/test/Driver/mingw.cpp<br>
===================================================================<br>
--- cfe/trunk/test/Driver/mingw.cpp<br>
+++ cfe/trunk/test/Driver/mingw.cpp<br>
<span class="">@@ -1,3 +1,8 @@<br>
+// 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<br>
+// CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"<br>
+// CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}include"<br>
+<br>
+<br>
 // 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<br>
 // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++"<br>
 // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32"<br>
</span>Index: cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
===================================================================<br>
--- cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
+++ cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
<div class="HOEnZb"><div class="h5">@@ -47,7 +47,7 @@<br>
   Archs.emplace_back(getTriple().getArchName());<br>
   Archs[0] += "-w64-mingw32";<br>
   Archs.emplace_back("mingw32");<br>
-  Arch = "unknown";<br>
+  Arch = Archs[0].str();<br>
   // lib: Arch Linux, Ubuntu, Windows<br>
   // lib64: openSUSE Linux<br>
   for (StringRef CandidateLib : {"lib", "lib64"}) {<br>
<br>
<br>
</div></div></blockquote></div><br></div>