svn commit: r300244 - stable/9/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu May 19 22:54:24 2016
New Revision: 300244
URL: https://svnweb.freebsd.org/changeset/base/300244

Log:
  MFS r300243:
  
    Follow-up r300233: Don't override MK_* from env as head does.
  
  PR:		D6271

Modified:
  stable/9/share/mk/bsd.own.mk
Directory Properties:
  stable/9/share/mk/   (props changed)

Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk	Thu May 19 22:53:44 2016	(r300243)
+++ stable/9/share/mk/bsd.own.mk	Thu May 19 22:54:24 2016	(r300244)
@@ -504,6 +504,7 @@ __DEFAULT_NO_OPTIONS+=FDT
 # MK_* options which default to "yes".
 #
 .for var in ${__DEFAULT_YES_OPTIONS}
+.if !defined(MK_${var})
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
@@ -512,6 +513,7 @@ MK_${var}:=	no
 .else
 MK_${var}:=	yes
 .endif
+.endif	# !defined(MK_${var})
 .endfor
 .undef __DEFAULT_YES_OPTIONS
 
@@ -519,6 +521,7 @@ MK_${var}:=	yes
 # MK_* options which default to "no".
 #
 .for var in ${__DEFAULT_NO_OPTIONS}
+.if !defined(MK_${var})
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
@@ -527,6 +530,7 @@ MK_${var}:=	yes
 .else
 MK_${var}:=	no
 .endif
+.endif	# !defined(MK_${var})
 .endfor
 .undef __DEFAULT_NO_OPTIONS