Date: Tue, 31 Mar 2015 20:20:07 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Craig Rodrigues <rodrigc@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: <D0608943-2DB0-453C-922C-3D29935346C4@FreeBSD.org> In-Reply-To: <C3DE89BD-C00C-4E20-A599-D987FA33A029@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>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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. Btw, please use patch -f for this, so it will error out, instead of accidentally reversing a patch. -Dimitry [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.27 iEYEARECAAYFAlUa5VcACgkQsF6jCi4glqMkIACfaw2dUgF9cb7OqvXXI6ATwsHc I3cAoIadYMqkWmZY/fb4smWvZ3n93Lag =CqmC -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D0608943-2DB0-453C-922C-3D29935346C4>