Date: Fri, 29 May 2009 19:09:48 +0200 From: Niclas Zeising <niclas.zeising@gmail.com> To: Andriy Gapon <avg@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r193040 - stable/7 Message-ID: <4A2016DC.80001@gmail.com> In-Reply-To: <200905291442.n4TEg290077819@svn.freebsd.org> References: <200905291442.n4TEg290077819@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Andriy Gapon wrote: > Author: avg > Date: Fri May 29 14:42:02 2009 > New Revision: 193040 > URL: http://svn.freebsd.org/changeset/base/193040 > > Log: > use new btxld when building world in older environment > > This is a direct commit to the branch. > This is for the benefit of those who define LOADER_ZFS_SUPPORT but > should't hurt anybody else. > Build of zfsboot requires new feature of btxld that it obtained > (via MFC) in r192697: "merge 177933. Allow for a zero length 'loader'" > (btxld is a build tool and a cross-build tool) > Please note that __FreeBSD_version was bumped some time after r192697 > for an unrelated change. > > Reviewed by: des > Approved by: jhb (mentor) > > Modified: > stable/7/Makefile.inc1 > > Modified: stable/7/Makefile.inc1 > ============================================================================== > --- stable/7/Makefile.inc1 Fri May 29 14:25:51 2009 (r193039) > +++ stable/7/Makefile.inc1 Fri May 29 14:42:02 2009 (r193040) > @@ -985,7 +985,7 @@ build-tools: > # > # cross-tools: Build cross-building tools > # > -.if ${TARGET_ARCH} != ${MACHINE_ARCH} > +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 702102 > .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" > _btxld= usr.sbin/btxld > .endif > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" > Is it possible to get something along this line in 8-CURRENT as well? I accidentally removed btxld once and when I was building world it stopped in sys/boot because it was missing. I had to manually build and install it before i could continue with my buildworld, which was a bit annoying. Regards! Niclas --
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A2016DC.80001>