From 9bc1f500d818fcd459ef5bb51a9fd87becb33290 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Thu, 19 May 2016 21:44:33 +0000 Subject: [PATCH] MFS r300233: Allow MK_ overrides PR: D6271 git-svn-id: svn://svn.freebsd.org/base/stable/9@300234 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- share/mk/bsd.own.mk | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 0cb9c2f49..c22c87266 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -507,9 +507,6 @@ __DEFAULT_NO_OPTIONS+=FDT .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif -.if defined(MK_${var}) -.error MK_${var} can't be set by a user. -.endif .if defined(WITHOUT_${var}) MK_${var}:= no .else @@ -525,9 +522,6 @@ MK_${var}:= yes .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif -.if defined(MK_${var}) -.error MK_${var} can't be set by a user. -.endif .if defined(WITH_${var}) MK_${var}:= yes .else @@ -645,9 +639,6 @@ MK_CLANG_IS_CC:= no .if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT) .error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set. .endif -.if defined(MK_${var}_SUPPORT) -.error MK_${var}_SUPPORT can't be set by a user. -.endif .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no .else @@ -664,9 +655,6 @@ MK_${var}_SUPPORT:= yes .if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H}) .error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set. .endif -.if defined(MK_${vv:H}) -.error MK_${vv:H} can't be set by a user. -.endif .if defined(WITH_${vv:H}) MK_${vv:H}:= yes .elif defined(WITHOUT_${vv:H}) @@ -685,9 +673,6 @@ MK_${vv:H}:= ${MK_${vv:T}} .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif -.if defined(MK_${var}) -.error MK_${var} can't be set by a user. -.endif .if ${COMPILER_FEATURES:Mc++11} .if defined(WITHOUT_${var}) MK_${var}:= no -- 2.45.0