From 5582d02207a3fb87ce3e5e1968fa8989e5ee4649 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 19 May 2016 22:53:44 +0000
Subject: [PATCH] Follow-up r300233: Don't override MK_* from env as head does.

PR:		D6271
Sponsored by:	EMC / Isilon Storage Division


git-svn-id: svn://svn.freebsd.org/base/stable/10@300243 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 share/mk/bsd.own.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 699a10609..6f0fd3ee3 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -480,6 +480,7 @@ __DEFAULT_NO_OPTIONS+=HYPERV
 # 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
@@ -488,6 +489,7 @@ MK_${var}:=	no
 .else
 MK_${var}:=	yes
 .endif
+.endif	# !defined(MK_${var})
 .endfor
 .undef __DEFAULT_YES_OPTIONS
 
@@ -495,6 +497,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
@@ -503,6 +506,7 @@ MK_${var}:=	yes
 .else
 MK_${var}:=	no
 .endif
+.endif	# !defined(MK_${var})
 .endfor
 .undef __DEFAULT_NO_OPTIONS
 
-- 
2.45.0