Page MenuHomeFreeBSD
Files F157438258

D34175.id102396.diff
No OneTemporary
Actions

D34175.id102396.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -626,7 +626,7 @@
.if ${BUILD_WITH_STRICT_TMPPATH} != 0
MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp
.if !exists(${MKTEMP})
-.error "mktemp binary doesn't exist in expected location: ${MKTEMP}"
+.error mktemp binary doesn't exist in expected location: ${MKTEMP}
.endif
.else
MKTEMP=mktemp
diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
--- a/share/mk/bsd.compiler.mk
+++ b/share/mk/bsd.compiler.mk
@@ -160,7 +160,7 @@
.for var in ${_exported_vars}
.if defined(${var}) && (!defined(${var}__${${X_}_cc_hash}) || ${${var}__${${X_}_cc_hash}} != ${${var}})
.if defined(${var}__${${X_}_ld_hash})
-.info "Cannot import ${X_}COMPILER variables since cached ${var} is different: ${${var}__${${X_}_cc_hash}} != ${${var}}"
+.info Cannot import ${X_}COMPILER variables since cached ${var} is different: ${${var}__${${X_}_cc_hash}} != ${${var}}
.endif
_can_export= no
.endif
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -199,11 +199,11 @@
# Absolute paths to OBJS should be an error inside ${SRCTOP}, but some users
# might be relying on this feature, so add an opt-out mechanism.
.if defined(SRCTOP) && ${OBJS:M${SRCTOP}*}
-.error "$$OBJS inside $$SRCTOP not allowed: ${OBJS:M${SRCTOP}*}"
+.error $$OBJS inside $$SRCTOP not allowed: ${OBJS:M${SRCTOP}*}
.elif ${OBJS:N${_ABSOLUTE_PATH_OBJS}:M/*}
-.error "$$OBJS absolute path not allowed: ${OBJS:N${_ABSOLUTE_PATH_OBJS}:M/*}. \
+.error $$OBJS absolute path not allowed: ${OBJS:N${_ABSOLUTE_PATH_OBJS}:M/*}.\
If this is intended, add them to _ABSOLUTE_PATH_OBJS to silence this error\
- or define _ALLOW_ABSOLUTE_OBJ_PATH to disable this diagnostic."
+ or define _ALLOW_ABSOLUTE_OBJ_PATH to disable this diagnostic.
.endif
.endif
DEPENDOBJS+= ${OBJS}
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk
--- a/share/mk/bsd.endian.mk
+++ b/share/mk/bsd.endian.mk
@@ -16,7 +16,7 @@
CAP_MKDB_ENDIAN= -b
LOCALEDEF_ENDIAN= -b
.elif ${.MAKE.OS} == "FreeBSD"
-.error "Don't know the endian of this architecture"
+.error Don't know the endian of this architecture
.else
#
# During bootstrapping on !FreeBSD OSes, we need to define some value. Short of
diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk
--- a/share/mk/bsd.linker.mk
+++ b/share/mk/bsd.linker.mk
@@ -46,7 +46,7 @@
.for var in ${_exported_vars}
.if defined(${var}) && (!defined(${var}__${${X_}_ld_hash}) || ${${var}__${${X_}_ld_hash}} != ${${var}})
.if defined(${var}__${${X_}_ld_hash})
-.info "Cannot import ${X_}LINKER variables since cached ${var} is different: ${${var}__${${X_}_ld_hash}} != ${${var}}"
+.info Cannot import ${X_}LINKER variables since cached ${var} is different: ${${var}__${${X_}_ld_hash}} != ${${var}}
.endif
_can_export= no
.endif
diff --git a/share/mk/bsd.mkopt.mk b/share/mk/bsd.mkopt.mk
--- a/share/mk/bsd.mkopt.mk
+++ b/share/mk/bsd.mkopt.mk
@@ -37,7 +37,7 @@
.for var in ${__DEFAULT_YES_OPTIONS}
.if !defined(MK_${var})
.if defined(WITH_${var}) && ${WITH_${var}} == "no"
-.warning "Use WITHOUT_${var}=1 instead of WITH_${var}=no"
+.warning Use WITHOUT_${var}=1 instead of WITH_${var}=no
.endif
.if defined(WITHOUT_${var}) # WITHOUT always wins
MK_${var}:= no
@@ -46,7 +46,7 @@
.endif
.else
.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
-.error "Illegal value for MK_${var}: ${MK_${var}}"
+.error Illegal value for MK_${var}: ${MK_${var}}
.endif
.endif # !defined(MK_${var})
.endfor
@@ -58,7 +58,7 @@
.for var in ${__DEFAULT_NO_OPTIONS}
.if !defined(MK_${var})
.if defined(WITH_${var}) && ${WITH_${var}} == "no"
-.warning "Use WITHOUT_${var}=1 instead of WITH_${var}=no"
+.warning Use WITHOUT_${var}=1 instead of WITH_${var}=no
.endif
.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT always wins
MK_${var}:= yes
@@ -67,7 +67,7 @@
.endif
.else
.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
-.error "Illegal value for MK_${var}: ${MK_${var}}"
+.error Illegal value for MK_${var}: ${MK_${var}}
.endif
.endif # !defined(MK_${var})
.endfor
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -124,7 +124,7 @@
WARNS \
WERROR
.if defined(NO_${var})
-.error "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
+.error NO_${var} is defined, but deprecated. Please use MK_${var}=no instead.
MK_${var}:=no
.endif
.endfor
diff --git a/share/mk/bsd.sanitizer.mk b/share/mk/bsd.sanitizer.mk
--- a/share/mk/bsd.sanitizer.mk
+++ b/share/mk/bsd.sanitizer.mk
@@ -24,7 +24,7 @@
.if !defined(BOOTSTRAPPING) && ${_use_sanitizers} != "no" && \
${COMPILER_TYPE} != "clang" && make(all)
-.error "Sanitizer instrumentation currently only supported with clang"
+.error Sanitizer instrumentation currently only supported with clang
.endif
# For libraries we only instrument the shared and PIE libraries by setting
diff --git a/share/mk/netbsd-tests.test.mk b/share/mk/netbsd-tests.test.mk
--- a/share/mk/netbsd-tests.test.mk
+++ b/share/mk/netbsd-tests.test.mk
@@ -6,7 +6,7 @@
TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H}
.if !exists(${TESTSRC}/)
-.error "Please define TESTSRC to the absolute path of the test sources, e.g. $${SRCTOP}/contrib/netbsd-tests/lib/libc/stdio"
+.error Please define TESTSRC to the absolute path of the test sources, e.g. $${SRCTOP}/contrib/netbsd-tests/lib/libc/stdio
.endif
.PATH: ${TESTSRC}

File Metadata

Mime Type
text/plain
Expires
Fri, May 22, 11:43 AM (10 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33419926
Default Alt Text
D34175.id102396.diff (5 KB)

Event Timeline