World broken in stage 1.1

[M. Warner Losh]

In message: <20040811221348.GB93983 at ip.net.ua>
            Ruslan Ermilov <ru at FreeBSD.org> writes:
: On Wed, Aug 11, 2004 at 04:04:20PM -0600, M. Warner Losh wrote:
: > In message: <20040810231044.GA70020 at xor.obsecurity.org>
: >             Kris Kennaway <kris at obsecurity.org> writes:
: > : More fallout from the wonderful new make(1) semantics? 
: > 
: > I think it is speficially related to the changes to src/Makefile and
: > src/Makefile.inc1.  If I s/${_+_}//g on those two files, it appears
: > that I can buildworld again (at least it doesn't die right away).
: > 
: How exactly does it die for you, please provide some logs.

The problem is due to the following in share/mk/sys.mk:

.if !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n"
_+_             ?=
.else
_+_             ?=      +
.endif

This should have a third clause:

.if ${MAKE_VERSION} >= 5200408030 && !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n"

so that _+_ is defined to be nothing for those versions of make that
don't yet support this new feature of posix.

Warner