The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d7be70f0ff9a2a3cf2a980e5c8214666d85a463b
commit d7be70f0ff9a2a3cf2a980e5c8214666d85a463b Author: Jessica Clarke <[email protected]> AuthorDate: 2023-07-09 17:49:35 +0000 Commit: Jessica Clarke <[email protected]> CommitDate: 2023-07-09 17:49:35 +0000 libiconv_modules: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D40929 --- lib/libiconv_modules/Makefile.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index 364e78c9bf85..85600c84576e 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -7,10 +7,6 @@ CFLAGS+= -I${SRCTOP}/lib/libc/iconv CFLAGS+= -Dbool=_Bool -.if !defined(COMPAT_32BIT) -SHLIBDIR= /usr/lib/i18n -.else -SHLIBDIR= /usr/lib32/i18n -.endif +SHLIBDIR= /usr/lib${COMPAT_libcompat:U}/i18n LIBDIR= ${SHLIBDIR} MK_PROFILE= no
