on 'btxld: zfsboot.ldr: Invalid argument' again

[John Baldwin]

On Friday 29 May 2009 8:37:56 am Andriy Gapon wrote:
> 
> So anybody else feels that the below should be committed?
> Most probably modulo __FreeBSD_version bump because it has just got bumped 
in
> stable/7 for a different reason.

Yes.
 
> > diff --git a/Makefile.inc1 b/Makefile.inc1
> > index 119ba09..5071065 100644
> > --- a/Makefile.inc1
> > +++ b/Makefile.inc1
> > @@ -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

-- 
John Baldwin