Date: Fri, 14 Jun 2013 16:24:07 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251748 - head/share/mk Message-ID: <201306141624.r5EGO74W086152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Fri Jun 14 16:24:07 2013 New Revision: 251748 URL: http://svnweb.freebsd.org/changeset/base/251748 Log: We cannot remove the _+_ trick, until old make is completely deprecated. But we don't want to set it to + for bmake since it breaks make -N which is used to supress the normal handling of targets marked with .MAKE (which seems broken in fmake and might be why _+_ was introduced). Add some comments to explain what's gong on. Reviewed by: obrien Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Fri Jun 14 15:58:24 2013 (r251747) +++ head/share/mk/sys.mk Fri Jun 14 16:24:07 2013 (r251748) @@ -95,7 +95,13 @@ ECHODIR ?= true .endif .endif -.if !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n" +.if defined(.PARSEDIR) +# _+_ appears to be a workaround for the special src .MAKE not working. +# setting it to + interferes with -N +_+_ ?= +.elif !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n" +# the check above matches only a single -n, so -n -n will result +# in _+_ = + _+_ ?= .else _+_ ?= +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306141624.r5EGO74W086152>