From owner-svn-src-all@FreeBSD.ORG  Mon Jan 21 23:12:51 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A81AE4D3;
 Mon, 21 Jan 2013 23:12:51 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 83C932C0;
 Mon, 21 Jan 2013 23:12:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0LNCphk098800;
 Mon, 21 Jan 2013 23:12:51 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0LNCpw6098799;
 Mon, 21 Jan 2013 23:12:51 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301212312.r0LNCpw6098799@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 21 Jan 2013 23:12:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245754 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jan 2013 23:12:51 -0000

Author: brooks
Date: Mon Jan 21 23:12:50 2013
New Revision: 245754
URL: http://svnweb.freebsd.org/changeset/base/245754

Log:
  Always bootstrap nmtree if it is not available on the host. It is fairly
  small and it is quite annoying to get all the way through buildworld
  only to discover that you forgot the DB_FROM_SRC (or soon NO_ROOT)
  option.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Jan 21 22:54:43 2013	(r245753)
+++ head/Makefile.inc1	Mon Jan 21 23:12:50 2013	(r245754)
@@ -1072,7 +1072,7 @@ _lex=		usr.bin/lex
 _yacc=		usr.bin/yacc
 .endif
 
-.if defined(DB_FROM_SRC) && ${BOOTSTRAPPING} < 1000026
+.if ${BOOTSTRAPPING} < 1000026
 _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
 .endif