Revert "Hack for libcheri trying to install CDDL libs despite BROKEN_OPTIONS+=CDDL"

This reverts commit 175095d.

Author: jrtc27

Makefile.libcompat

@@ -11,10 +11,7 @@ __<${_this:T}>__:
 
 _LC_LIBDIRS.yes=		lib
 _LC_LIBDIRS.yes+=		gnu/lib
-# XXX: See src.opts.mk hack
-.if ${MK_COMPAT_CHERIABI} != "yes" || !${TARGET_ARCH:Mriscv64*}
 _LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
-.endif
 _LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
 _LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib
 

share/mk/src.opts.mk

@@ -380,7 +380,6 @@ BROKEN_OPTIONS+=NS_CACHING
 # Skip until https://github.com/CTSRD-CHERI/llvm-project/issues/379 is fixed.
 BROKEN_OPTIONS+=LIBCPLUSPLUS CXX
 # Crash in ZFS code. TODO: investigate
-# Remove corresponding hack in Makefile.libcompat when removing
 BROKEN_OPTIONS+=CDDL
 
 # Some compilation failure: TODO: investigate