From owner-svn-src-all@FreeBSD.ORG Sun Jul 13 23:53:41 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 934E9E6B; Sun, 13 Jul 2014 23:53:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 812A62539; Sun, 13 Jul 2014 23:53:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DNrfj6082784; Sun, 13 Jul 2014 23:53:41 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DNrfJ6082783; Sun, 13 Jul 2014 23:53:41 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201407132353.s6DNrfJ6082783@svn.freebsd.org> From: Julio Merino Date: Sun, 13 Jul 2014 23:53:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268598 - 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.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 23:53:41 -0000 Author: jmmv Date: Sun Jul 13 23:53:41 2014 New Revision: 268598 URL: http://svnweb.freebsd.org/changeset/base/268598 Log: Explicitly disable the build of tests when building bmake. During "make buildworld", building bmake is (one of) the very first steps and we should not be building any of its tests. Conceptually, this is the right thing to do 1) for build simplicity reasons and 2) because there is no need to build any tests this early on. In practice, this fixes tinderbox builds of CURRENT from 9.x when MK_TESTS is enabled. This is because bsd.test.mk needs some modern bmake features not present in 9.x (:tW) and tinderbox is forcing the build to use the CURRENT share/mk files from the very beginning (see r266617). By skipping the build of the tests when still using the host make, we omit the problem. Arguably, what tinderbox is doing is wrong and needs to be addressed, but that is a separate issue. Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sun Jul 13 23:10:39 2014 (r268597) +++ head/Makefile Sun Jul 13 23:53:41 2014 (r268598) @@ -331,6 +331,7 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ MMAKE= ${MMAKEENV} ${MAKE} \ -DNO_MAN -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR \ + MK_TESTS=no \ DESTDIR= PROGNAME=${MYMAKE:T} bmake: .PHONY