svn commit: r367648 - head/share/mk

[Ed Maste]

Author: emaste
Date: Fri Nov 13 19:08:42 2020
New Revision: 367648
URL: https://svnweb.freebsd.org/changeset/base/367648

Log:
  Fix `make makeman` after r367577
  
  WITH_INIT_ALL_ZERO and WITH_INIT_ALL_PATTERN are mutually exclusive.
  The .error when they were both set broke makeman so demote it to a
  warning (and presumably the compiler will fail on an error later on).
  
  We could improve this to make one take precedence but this is sufficient
  for now.
  
  MFC with:	r367577
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/bsd.opts.mk

Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk	Fri Nov 13 18:50:24 2020	(r367647)
+++ head/share/mk/bsd.opts.mk	Fri Nov 13 19:08:42 2020	(r367648)
@@ -88,7 +88,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
 .include <bsd.mkopt.mk>
 
 .if ${MK_INIT_ALL_PATTERN} == "yes" && ${MK_INIT_ALL_ZERO} == "yes"
-.error WITH_INIT_ALL_PATTERN and WITH_INIT_ALL_ZERO are mutually exclusive.
+.warning WITH_INIT_ALL_PATTERN and WITH_INIT_ALL_ZERO are mutually exclusive.
 .endif
 
 #