diff options
author | Ed Maste <emaste@FreeBSD.org> | 2020-11-13 19:08:42 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2020-11-13 19:08:42 +0000 |
commit | 9a4d64029e32dfbb25b3e7fc29519ff8fff431d1 (patch) | |
tree | ac3116784d9ccc21d35a6e37d7627114e3483b53 /share | |
parent | 07a605f42789e8920754d478135146b59f3a29ab (diff) | |
download | src-test-9a4d64029e32dfbb25b3e7fc29519ff8fff431d1.tar.gz src-test-9a4d64029e32dfbb25b3e7fc29519ff8fff431d1.zip |
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
Notes
Notes:
svn path=/head/; revision=367648
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.opts.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 98e949731e601..d0e7f1cb00ba4 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -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 # |