r241432 - Teach mingw toolchain the msys2 mingw-w64 distribution C++ dirs.

[Yaron Keren]

Hi,  Please see if the attached patch works on opensuse.

I'll look at the cygnus ld issue later.


2015-07-07 10:38 GMT+03:00 İsmail Dönmez <ismail at donmez.ws>:

> Hi,
>
> On Mon, Jul 6, 2015 at 10:40 AM, Yaron Keren <yaron.keren at gmail.com>
> wrote:
> > Author: yrnkrn
> > Date: Mon Jul  6 02:40:10 2015
> > New Revision: 241432
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=241432&view=rev
> > Log:
> > Teach mingw toolchain the msys2 mingw-w64 distribution C++ dirs.
> >
> >
> > Modified:
> >     cfe/trunk/lib/Driver/MinGWToolChain.cpp
> >     cfe/trunk/lib/Driver/ToolChains.h
>
> I tried this revision on openSUSE MinGW toolchain and its missing one
> include path, which is $GCC_ROOT/nclude/c++/x86_64-w64-mingw32 which
> contains "bits" and "ext" directories. Would you mind adding that to
> the list too?
>
> Thanks!
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150707/b6f1caef/attachment.html>
-------------- next part --------------
Index: tools/clang/lib/Driver/MinGWToolChain.cpp
===================================================================
--- tools/clang/lib/Driver/MinGWToolChain.cpp	(revision 241468)
+++ tools/clang/lib/Driver/MinGWToolChain.cpp	(working copy)
@@ -146,4 +146,8 @@
     addSystemInclude(DriverArgs, CC1Args, CppIncludeBase + Arch);
     addSystemInclude(DriverArgs, CC1Args, CppIncludeBase + "backward");
   }
+  // openSUSE MinGW toolchain requires $GCC_ROOT/include/c++/x86_64-w64-mingw32.
+  llvm::SmallString<1024> openSUSEdir(Base);
+  llvm::sys::path::append(openSUSEdir, "include", "c++", Arch);
+  addSystemInclude(DriverArgs, CC1Args, openSUSEdir);
 }