git: 3864bd4fd217 - main - lib: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT

The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=3864bd4fd217f46e4c9126ca2c48db96c44682ef

commit 3864bd4fd217f46e4c9126ca2c48db96c44682ef
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-07-09 17:49:53 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-07-09 17:49:53 +0000

    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 8fad2cda93c7 ("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
---
 lib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index d82fca7c5c69..47ff3cec7ebf 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -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