Date: Mon, 05 Jan 2009 09:12:02 -0800 From: Sam Leffler <sam@freebsd.org> To: Doug Barton <dougb@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r186749 - head/usr.sbin/mergemaster Message-ID: <49623F62.6000206@freebsd.org> In-Reply-To: <200901042059.n04KxNhW074100@svn.freebsd.org> References: <200901042059.n04KxNhW074100@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Doug Barton wrote: > Author: dougb > Date: Sun Jan 4 20:59:23 2009 > New Revision: 186749 > URL: http://svn.freebsd.org/changeset/base/186749 > > Log: > Instead of using obj and all targets which are not cross-build aware, > use _obj and everything which are. > > Submitted by: ru > > Modified: > head/usr.sbin/mergemaster/mergemaster.sh > > Modified: head/usr.sbin/mergemaster/mergemaster.sh > ============================================================================== > --- head/usr.sbin/mergemaster/mergemaster.sh Sun Jan 4 19:23:44 2009 (r186748) > +++ head/usr.sbin/mergemaster/mergemaster.sh Sun Jan 4 20:59:23 2009 (r186749) > @@ -592,10 +592,11 @@ case "${RERUN}" in > ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs > ;; > esac > + od=${TEMPROOT}/usr/obj > ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs && > - MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} obj SUBDIR_OVERRIDE=etc && > - MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} all SUBDIR_OVERRIDE=etc && > - MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || > + MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && > + MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && > + MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || > { echo ''; > echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; > echo " the temproot environment"; > > > This fixes my cross-install setup; thank you. Sam
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49623F62.6000206>