lib: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT

In the process, delete a COMPAT_SOFTFP remnant that was missed in
previous sweeps.

See commit 8fad2cda93 ("bsd.compat.mk: Provide new CPP and sub-make
variables") for the context behind this change.

Reviewed by:	emaste, brooks, jhb
Differential Revision:	https://reviews.freebsd.org/D40931
This commit is contained in:
Jessica Clarke 2023-07-09 18:49:53 +01:00
parent 45be5010ce
commit 3864bd4fd2

View file

@ -148,7 +148,7 @@ SUBDIR_DEPEND_libpcap= ofed
.endif
SUBDIR_DEPEND_nss_tacplus= libtacplus
.if !defined(COMPAT_32BIT)
.if !defined(COMPAT_LIBCOMPAT)
SUBDIR+= flua
SUBDIR_DEPEND_flua= libjail
.endif
@ -160,7 +160,7 @@ SUBDIR.${MK_BLACKLIST}+=libblacklist
SUBDIR.${MK_BLUETOOTH}+=libbluetooth libsdp
SUBDIR.${MK_BSNMP}+= libbsnmp
.if !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP)
.if !defined(COMPAT_LIBCOMPAT)
.if ${MK_CLANG} != "no" || ${MK_LLD} != "no" || \
${MK_LLDB} != "no" || ${MK_LLVM_BINUTILS} != "no"
SUBDIR+= clang