From 976716664f8e3d6675f56b55c0026316ae5accd8 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 8 Nov 2019 03:14:06 +0000 Subject: [PATCH] Turn the error about a lack of LIBCOMPAT into a warning. Add some diagnostic output. This works around the fact that buildworld calls cleandir in libexec with the wrong MACHINE_ARCH (i386 on amd64) when the OBJ directory is empty. Reported by: bdragon, jkim --- share/mk/bsd.compat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index c50cd79c306c..73b236bc6666 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -103,7 +103,7 @@ LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTFP # In the program linking case, select LIBCOMPAT .if defined(NEED_COMPAT) .ifndef HAS_COMPAT -.error NEED_COMPAT defined, but no LIBCOMPAT is available +.warning NEED_COMPAT defined, but no LIBCOMPAT is available (COMPAT_ARCH == ${COMPAT_ARCH} .elif !${HAS_COMPAT:M${NEED_COMPAT}} && ${NEED_COMPAT} != "any" .error NEED_COMPAT (${NEED_COMPAT}) defined, but not in HAS_COMPAT ($HAS_COMPAT) .elif ${NEED_COMPAT} == "any"