git: d826802c44b1 - stable/13 - bsd.compat.mk: A few cosmetic fixes.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 Apr 2022 23:12:40 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=d826802c44b191abf7065c1b9d1a0abde75a8ceb
commit d826802c44b191abf7065c1b9d1a0abde75a8ceb
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-02-04 23:57:28 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-04-29 23:07:24 +0000
bsd.compat.mk: A few cosmetic fixes.
- Add a missing ')' to a warning.
- Consistently use {} when expanding variables.
- Remove a spurious blank line.
Reviewed by: imp, emaste
Obtained from: CheriBSD
Differential Revision: https://reviews.freebsd.org/D34172
(cherry picked from commit ffe74ab77f234fabe691bd79e254cd000e07dfe0)
---
share/mk/bsd.compat.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 91b2e078cc46..45a8a8c48967 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -109,9 +109,9 @@ LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTFP
# In the program linking case, select LIBCOMPAT
.if defined(NEED_COMPAT)
.ifndef HAS_COMPAT
-.warning NEED_COMPAT defined, but no LIBCOMPAT is available (COMPAT_ARCH == ${COMPAT_ARCH}
+.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)
+.error NEED_COMPAT (${NEED_COMPAT}) defined, but not in HAS_COMPAT (${HAS_COMPAT})
.elif ${NEED_COMPAT} == "any"
.endif
.ifdef WANT_COMPAT
@@ -128,7 +128,6 @@ _LIBCOMPAT:= ${WANT_COMPAT}
.endif
.endif
-
# -------------------------------------------------------------------
# Generic code for each type.
# Set defaults based on type.