Date: Fri, 25 Sep 2015 22:51:31 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288240 - head/share/mk Message-ID: <201509252251.t8PMpVZm092524@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Sep 25 22:51:30 2015 New Revision: 288240 URL: https://svnweb.freebsd.org/changeset/base/288240 Log: Explicitly enable .MAKE.ALWAYS_PASS_JOB_QUEUE for bmake. This is a NOP as r254419 enabled this by default in bmake. Add it here though to ensure it is known that we are using this as a default and in case a bmake import removes the default we have. This tells bmake to always pass job tokens into sub-commands. Otherwise it would only do so if the target being built depended on the special .MAKE target (which causes _all_ commands to be executed with -n as well) or if the command matches '${MAKE}/${.MAKE}/$(MAKE)/$(.MAKE)/make' (before expansion, so ${LIB32WMAKE} would not qualify). Using '+' on a command (which runs the command with -n) would not pass the job token even though it is a documented way to achieve the .MAKE effect on a command. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Fri Sep 25 22:45:23 2015 (r288239) +++ head/share/mk/sys.mk Fri Sep 25 22:51:30 2015 (r288240) @@ -394,6 +394,10 @@ SHELL= ${__MAKE_SHELL} # Tell bmake the makefile preference .MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile +# Tell bmake to always pass job tokens, regardless of target depending on +# .MAKE or looking like ${MAKE}/${.MAKE}/$(MAKE)/$(.MAKE)/make. +.MAKE.ALWAYS_PASS_JOB_QUEUE= yes + # By default bmake does *not* use set -e # when running target scripts, this is a problem for many makefiles here. # So define a shell that will do what FreeBSD expects.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509252251.t8PMpVZm092524>