diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-19 21:41:35 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-19 21:41:35 +0000 |
| commit | 93b75e5d4a3b77903672c858910e7b7687952275 (patch) | |
| tree | 1b24f84337b54bce7fc4b91272c2bb52318a48e9 /share/mk | |
| parent | af2f11439d8bef8dc6b13fdd5692b0425eae6838 (diff) | |
| download | FreeBSD-src-93b75e5d4a3b77903672c858910e7b7687952275.zip FreeBSD-src-93b75e5d4a3b77903672c858910e7b7687952275.tar.gz | |
Allow MK_ overrides.
This is a direct commit to stable.
This was done in head in r264661 and is needed to force certain options off
for ports.
PR: D6271
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.own.mk | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 23ffa24..699a106 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -483,9 +483,6 @@ __DEFAULT_NO_OPTIONS+=HYPERV .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 @@ -501,9 +498,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 @@ -621,9 +615,6 @@ MK_TESTS:= 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 @@ -640,9 +631,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}) @@ -661,9 +649,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 |
