git: 6f6fbfa3a835 - main - Remove quotes around Makefile .error/.warn/.info strings
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 22 Jan 2022 19:03:38 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=6f6fbfa3a83578332f5605a97108ef28d6726c29
commit 6f6fbfa3a83578332f5605a97108ef28d6726c29
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-01-15 21:20:24 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-01-22 19:03:07 +0000
Remove quotes around Makefile .error/.warn/.info strings
The text after .error et al is emitted verbatim.
Reviewed by: sjg
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D33904
---
Makefile | 2 +-
Makefile.inc1 | 4 ++--
lib/Makefile | 2 +-
lib/libc/tests/net/getaddrinfo/Makefile | 2 +-
lib/libc/tests/ssp/Makefile | 2 +-
share/zoneinfo/Makefile | 2 +-
stand/i386/Makefile.inc | 2 +-
tools/build/Makefile | 2 +-
tools/build/mk/Makefile.boot | 2 +-
usr.bin/mandoc/Makefile | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index adba83592743..2b39f814250c 100644
--- a/Makefile
+++ b/Makefile
@@ -729,7 +729,7 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \
config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \
grep -v WARNING: | cut -f 2
.if empty(TARGET_ARCH_${kernel})
-.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old."
+.error Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old.
.endif
universe_kernconfs_${TARGET_ARCH_${kernel}}: universe_kernconf_${TARGET}_${kernel}
universe_kernconf_${TARGET}_${kernel}: .MAKE
diff --git a/Makefile.inc1 b/Makefile.inc1
index 3d958033f2b3..9a9d6586ddfc 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -49,7 +49,7 @@
# obj depend all install clean cleandepend cleanobj
.if !defined(TARGET) || !defined(TARGET_ARCH)
-.error "Both TARGET and TARGET_ARCH must be defined."
+.error Both TARGET and TARGET_ARCH must be defined.
.endif
.if make(showconfig) || make(test-system-*)
@@ -167,7 +167,7 @@ _t= ${TARGET_ARCH}/${TARGET}
.if ${.MAKE.OS} != "FreeBSD"
CROSSBUILD_HOST=${.MAKE.OS}
.if ${.MAKE.OS} != "Linux" && ${.MAKE.OS} != "Darwin"
-.warning "Unsupported crossbuild system: ${.MAKE.OS}. Build will probably fail!"
+.warning Unsupported crossbuild system: ${.MAKE.OS}. Build will probably fail!
.endif
# We need to force NO_ROOT/DB_FROM_SRC builds when building on other operating
# systems since the BSD.foo.dist specs contain users and groups that do not
diff --git a/lib/Makefile b/lib/Makefile
index 43c345daf356..d34f40616396 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -187,7 +187,7 @@ SUBDIR.${MK_STATS}+= libstats
${MACHINE_CPUARCH} == "powerpc")
_libclang_rt= libclang_rt
.elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all)
-.error "Requested build with sanitizers but cannot build runtime libraries!"
+.error Requested build with sanitizers but cannot build runtime libraries!
.endif
.if ${MK_CXX} != "no"
diff --git a/lib/libc/tests/net/getaddrinfo/Makefile b/lib/libc/tests/net/getaddrinfo/Makefile
index 96b60d2a9792..edf335cd222f 100644
--- a/lib/libc/tests/net/getaddrinfo/Makefile
+++ b/lib/libc/tests/net/getaddrinfo/Makefile
@@ -8,7 +8,7 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T}
BINDIR= ${TESTSDIR}
-.error "This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD)"
+.error This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD)
NETBSD_ATF_TESTS_SH= getaddrinfo_test
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
index 452c57246e39..936ada01a760 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -38,7 +38,7 @@ PROGS+= h_raw
LDADD.h_raw+= ${SANITIZER_LDFLAGS}
.else
.if make(all)
-.info "Could not find runtime library ${_libclang_rt_ubsan}, skipping h_raw"
+.info Could not find runtime library ${_libclang_rt_ubsan}, skipping h_raw
.endif
.endif
.endif
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 6e4cb51a63e3..0360b59288ab 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -39,7 +39,7 @@ CONTRIBDIR= ${SRCTOP}/contrib/tzdata/
.PATH: ${CONTRIBDIR}
.if defined(LEAPSECONDS)
-.warning "Using backwards compatibility variable for LEAPSECONDS; please use WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead"
+.warning Using backwards compatibility variable for LEAPSECONDS; please use WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead
MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes
.endif
diff --git a/stand/i386/Makefile.inc b/stand/i386/Makefile.inc
index 119f8a37162f..d12434487877 100644
--- a/stand/i386/Makefile.inc
+++ b/stand/i386/Makefile.inc
@@ -35,7 +35,7 @@ DO32=1
.if defined(LOADER_FIREWIRE_SUPPORT)
MK_LOADER_FIREWIRE=yes
-.warning "LOADER_FIREWIRE_SUPPORT deprecated, please move to WITH_LOADER_FIREWIRE"
+.warning LOADER_FIREWIRE_SUPPORT deprecated, please move to WITH_LOADER_FIREWIRE
.endif
.include "../Makefile.inc"
diff --git a/tools/build/Makefile b/tools/build/Makefile
index b9eff032cb81..e39b418b744d 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -34,7 +34,7 @@ _MACOS_SDK_DIR=${_XCODE_ROOT}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sd
.endif
HOST_INCLUDE_ROOT=${_MACOS_SDK_DIR}/usr/include
.if !exists(${HOST_INCLUDE_ROOT}/stdio.h)
-.error "You must install the macOS SDK (try xcode-select --install)"
+.error You must install the macOS SDK (try xcode-select --install)
.endif
.else
HOST_INCLUDE_ROOT=/usr/include
diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot
index 4e6f3508b30d..138dff45930b 100644
--- a/tools/build/mk/Makefile.boot
+++ b/tools/build/mk/Makefile.boot
@@ -65,7 +65,7 @@ RANLIBFLAGS:=
# MacOS ships /usr/lib/libarchive.dylib but doesn't provide the headers
CFLAGS+= -idirafter ${SRCTOP}/contrib/libarchive/libarchive
.else
-.error "Unsupported build OS: ${.MAKE.OS}"
+.error Unsupported build OS: ${.MAKE.OS}
.endif
.endif # ${.MAKE.OS} != "FreeBSD"
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index fcad5e8c16e9..f0b17349fac1 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -15,7 +15,7 @@ LINKS= ${BINDIR}/mandoc ${BINDIR}/whatis \
${BINDIR}/mandoc ${BINDIR}/makewhatis \
${BINDIR}/mandoc ${BINDIR}/apropos
.elif defined(BOOTSTRAPPING)
-.error "MK_MAN_UTILS should be set to yes when bootstrapping"
+.error MK_MAN_UTILS should be set to yes when bootstrapping
.endif
LIBMAN_SRCS= man.c \