Date: Tue, 31 Mar 2015 12:38:01 -0700 From: Craig Rodrigues <rodrigc@FreeBSD.org> To: Dimitry Andric <dim@freebsd.org> Cc: "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org>, FreeBSD Toolchain <freebsd-toolchain@freebsd.org> Subject: Re: CROSS_TOOLCHAIN=amd64-gcc fails to build after clang 3.6.0 import Message-ID: <CAG=rPVefo4BvRPiXhhESj9TrALDQeMY17ua7sTY2zvNmdFN5Ow@mail.gmail.com> In-Reply-To: <D0608943-2DB0-453C-922C-3D29935346C4@FreeBSD.org> References: <CAG=rPVe%2BzAuD_wuUC1Hro%2BTup5zWv85J3LHezYD0y=M8U2SRTg@mail.gmail.com> <5F90BE99-E82C-4444-9E4C-5963B40AA3B0@FreeBSD.org> <CAG=rPVfaoL5SLUY%2BpjAe2FM1EYD_cGF-vy7vOsSu6EUSyJW5yQ@mail.gmail.com> <C3DE89BD-C00C-4E20-A599-D987FA33A029@FreeBSD.org> <D0608943-2DB0-453C-922C-3D29935346C4@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Mar 31, 2015 at 11:20 AM, Dimitry Andric <dim@freebsd.org> wrote: > On 31 Mar 2015, at 20:13, Dimitry Andric <dim@FreeBSD.org> wrote: > ... > > 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. > > OK, I undid the patch. Now the clang and libc++ parts build, but I'm still getting problems building rescue: https://jenkins.freebsd.org/job/FreeBSD_HEAD_external_toolchain_gcc/29/console -- Craig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG=rPVefo4BvRPiXhhESj9TrALDQeMY17ua7sTY2zvNmdFN5Ow>