On Tue, Mar 31, 2015 at 11:20 AM, Dimitry Andric <d...@freebsd.org> wrote:
> On 31 Mar 2015, at 20:13, Dimitry Andric <d...@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 _______________________________________________ freebsd-toolchain@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-toolchain To unsubscribe, send any mail to "freebsd-toolchain-unsubscr...@freebsd.org"
