Author: bdrewery Date: Thu May 19 21:44:33 2016 New Revision: 300234 URL: https://svnweb.freebsd.org/changeset/base/300234
Log: MFS r300233: Allow MK_ overrides 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 21:41:35 2016 (r300233) +++ stable/9/share/mk/bsd.own.mk Thu May 19 21:44:33 2016 (r300234) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"