CROSS_TOOLCHAIN=amd64-gcc fails to build after clang 3.6.0 import

[Dimitry Andric]

On 31 Mar 2015, at 19:17, Craig Rodrigues <rodrigc at FreeBSD.org> wrote:
> 
> On Mon, Mar 23, 2015 at 12:12 AM, Dimitry Andric <dim at freebsd.org> wrote:
...
> > Yes, this is a bug in libc++, when compiling it with newer versions of
> > gcc.  I reported this upstream some time ago: https://llvm.org/PR22771
> >
> > Still haven't had enough time to test Eric Fiselier's patch for it.  I
> > hope I see the bottom of my TODO list anytime soon...
> >
> > -Dimitry
> >
> 
> Hi,
> 
> I just updated my tree to include your latest fixes such as r28064.
> 
> I'm still getting this:
> 
>                  from /builds/FreeBSD_HEAD_external_toolchain_gcc/lib/clang/libclangast/../../../contrib/llvm/tools/clang/lib/AST/DeclBase.cpp:14:
> /builds/FreeBSD_HEAD_external_toolchain_gcc/obj/builds/FreeBSD_HEAD_external_toolchain_gcc/tmp/usr/include/c++/v1/type_traits:845:28: error:   initializing argument 1 of 'char std::__1::__is_convertible_imp::__test(_Tp) [with _Tp = clang::StoredDeclsList]'
>  template <class _Tp> char  __test(_Tp);
>                             ^
> *** [DeclBase.o] Error code 1
> 
> make[6]: stopped in /builds/FreeBSD_HEAD_external_toolchain_gcc/lib/clang/libclangast
> 
> Any ideas?

Yes, see your log:

Started by user rodrigc
Building remotely on jenkins10a.freebsd.org (FreeBSD-10) in workspace /builds/FreeBSD_HEAD_external_toolchain_gcc
Updating svn://svn.freebsd.org/base/head at revision '2015-03-31T00:49:32.815 +0000'
[...]
G         contrib/libc++/include/type_traits
U         contrib/libarchive/libarchive/archive_read_disk_posix.c
At revision 280872
[...]

but then:

+ patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: contrib/libc++/include/type_traits
|===================================================================
|--- contrib/libc++/include/type_traits (revision 280762)
|+++ contrib/libc++/include/type_traits (working copy)
--------------------------
Patching file contrib/libc++/include/type_traits using Plan A...
Reversed (or previously applied) patch detected!  Assume -R? [y]
Hunk #1 succeeded at 842.
Hunk #2 succeeded at 877.
Hmm...  Ignoring the trailing garbage.
done

E.g., it undoes the change to type_traits that was merged in the subversion update.

-Dimitry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 194 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/freebsd-testing/attachments/20150331/6ca99da1/attachment.sig>