opts: Remove CHERI_REVOKE dependency on CHERI

The CHERI option mostly did things orthoginal to CHERI_REVOKE support and now does nothing so remove the dependency.
CTSRD-CHERI · Jul 22, 2023 · 50dfbb8 · 50dfbb8
1 parent b7babf2
commit 50dfbb8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
@@ -86,7 +86,6 @@ __DEFAULT_NO_OPTIONS = \
  UBSAN
 
 __DEFAULT_DEPENDENT_OPTIONS = \
- CHERI_CAPREVOKE/CHERI \
  MAKE_CHECK_USE_SANDBOX/TESTS \
  STAGING_MAN/STAGING \
  STAGING_PROG/STAGING \

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
@@ -214,6 +214,7 @@ __DEFAULT_NO_OPTIONS = \
 
 __DEFAULT_YES_OPTIONS+= \
  CHERI \
+ CHERI_CAPREVOKE \
  CHERIBSDBOX \
  LIB64C