diff options
Diffstat (limited to 'share/mk/bsd.opts.mk')
| -rw-r--r-- | share/mk/bsd.opts.mk | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 7e5c985957f0..38d53cc6bf30 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -1,4 +1,3 @@ -# $FreeBSD$ # # Option file for bmake builds. These options are available to all users of # bmake (including the source tree userland and kernel builds). They generally @@ -61,12 +60,15 @@ __DEFAULT_YES_OPTIONS = \ MAKE_CHECK_USE_SANDBOX \ MAN \ MANCOMPRESS \ + MANSPLITPKG \ NIS \ NLS \ OPENSSH \ + RELRO \ SSP \ TESTS \ TOOLCHAIN \ + UNDEFINED_VERSION \ WARNS \ WERROR @@ -75,10 +77,7 @@ __DEFAULT_NO_OPTIONS = \ BIND_NOW \ CCACHE_BUILD \ CTF \ - INIT_ALL_PATTERN \ - INIT_ALL_ZERO \ INSTALL_AS_USER \ - MANSPLITPKG \ PROFILE \ RETPOLINE \ STALE_STAGED \ @@ -103,31 +102,15 @@ __DEFAULT_NO_OPTIONS+= PIE __DEFAULT_YES_OPTIONS+=PIE .endif -.include <bsd.mkopt.mk> +__SINGLE_OPTIONS = \ + INIT_ALL -.if ${MK_INIT_ALL_PATTERN} == "yes" && ${MK_INIT_ALL_ZERO} == "yes" -.warning WITH_INIT_ALL_PATTERN and WITH_INIT_ALL_ZERO are mutually exclusive. -.endif +__INIT_ALL_OPTIONS= none pattern zero +__INIT_ALL_DEFAULT= none -# -# Supported NO_* options (if defined, MK_* will be forced to "no", -# regardless of user's setting). -# -# These are transitional and will disappaer in the FreeBSD 12. -# -.for var in \ - CTF \ - DEBUG_FILES \ - INSTALLLIB \ - MAN \ - PROFILE \ - WARNS \ - WERROR -.if defined(NO_${var}) -.error NO_${var} is defined, but deprecated. Please use MK_${var}=no instead. -MK_${var}:=no -.endif -.endfor +.-include <local.opts.mk> + +.include <bsd.mkopt.mk> .include <bsd.cpu.mk> |