From owner-svn-src-stable-7@FreeBSD.ORG Fri May 29 14:42:02 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8B51B10656A3;
Fri, 29 May 2009 14:42:02 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 797B78FC24;
Fri, 29 May 2009 14:42:02 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEg2nX077821;
Fri, 29 May 2009 14:42:02 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TEg290077819;
Fri, 29 May 2009 14:42:02 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200905291442.n4TEg290077819@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 29 May 2009 14:42:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r193040 - stable/7
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>,
<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>,
<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2009 14:42:03 -0000
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