svn commit: r264239 - head/share/mk

Warner Losh imp at FreeBSD.org
Mon Apr 7 21:16:52 UTC 2014


Author: imp
Date: Mon Apr  7 21:16:51 2014
New Revision: 264239
URL: http://svnweb.freebsd.org/changeset/base/264239

Log:
  Need to test .MAKE.LEVEL everywhere before using it for bootstrapping
  issues between fmake and bmake.

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Mon Apr  7 21:12:09 2014	(r264238)
+++ head/share/mk/bsd.own.mk	Mon Apr  7 21:16:51 2014	(r264239)
@@ -440,7 +440,7 @@ MK_${var}:=	yes
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
 .if defined(MK_${var})
-.if ${.MAKE.LEVEL} == 0
+.if defined(.MAKE.LEVEL) && ${.MAKE.LEVEL} == 0
 .error MK_${var} can't be set by a user.
 .endif
 .else
@@ -601,7 +601,7 @@ MK_${vv:H}:=	${MK_${vv:T}}
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
 .if defined(MK_${var})
-.if ${.MAKE.LEVEL} == 0
+.if defined(.MAKE.LEVEL) && ${.MAKE.LEVEL} == 0
 .error MK_${var} can't be set by a user.
 .endif
 .else


More information about the svn-src-head mailing list