svn commit: r268598 - head

Julio Merino jmmv at FreeBSD.org
Sun Jul 13 23:53:41 UTC 2014


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


More information about the svn-src-head mailing list