Date: Fri, 29 May 2009 14:42:02 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r193040 - stable/7 Message-ID: <200905291442.n4TEg290077819@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905291442.n4TEg290077819>