Remove more quotes around Makefile .error/.warn/.info strings.
Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D34175
This commit is contained in:
parent
6bea696af2
commit
bca92be683
@ -626,7 +626,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH}
|
|||||||
.if ${BUILD_WITH_STRICT_TMPPATH} != 0
|
.if ${BUILD_WITH_STRICT_TMPPATH} != 0
|
||||||
MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp
|
MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp
|
||||||
.if !exists(${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
|
.endif
|
||||||
.else
|
.else
|
||||||
MKTEMP=mktemp
|
MKTEMP=mktemp
|
||||||
|
@ -160,7 +160,7 @@ _can_export= yes
|
|||||||
.for var in ${_exported_vars}
|
.for var in ${_exported_vars}
|
||||||
.if defined(${var}) && (!defined(${var}__${${X_}_cc_hash}) || ${${var}__${${X_}_cc_hash}} != ${${var}})
|
.if defined(${var}) && (!defined(${var}__${${X_}_cc_hash}) || ${${var}__${${X_}_cc_hash}} != ${${var}})
|
||||||
.if defined(${var}__${${X_}_ld_hash})
|
.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
|
.endif
|
||||||
_can_export= no
|
_can_export= no
|
||||||
.endif
|
.endif
|
||||||
|
@ -199,11 +199,11 @@ DEPEND_FILTER= C,/,_,g
|
|||||||
# Absolute paths to OBJS should be an error inside ${SRCTOP}, but some users
|
# 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.
|
# might be relying on this feature, so add an opt-out mechanism.
|
||||||
.if defined(SRCTOP) && ${OBJS:M${SRCTOP}*}
|
.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/*}
|
.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\
|
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
|
||||||
.endif
|
.endif
|
||||||
DEPENDOBJS+= ${OBJS}
|
DEPENDOBJS+= ${OBJS}
|
||||||
|
@ -16,7 +16,7 @@ TARGET_ENDIANNESS= 4321
|
|||||||
CAP_MKDB_ENDIAN= -b
|
CAP_MKDB_ENDIAN= -b
|
||||||
LOCALEDEF_ENDIAN= -b
|
LOCALEDEF_ENDIAN= -b
|
||||||
.elif ${.MAKE.OS} == "FreeBSD"
|
.elif ${.MAKE.OS} == "FreeBSD"
|
||||||
.error "Don't know the endian of this architecture"
|
.error Don't know the endian of this architecture
|
||||||
.else
|
.else
|
||||||
#
|
#
|
||||||
# During bootstrapping on !FreeBSD OSes, we need to define some value. Short of
|
# During bootstrapping on !FreeBSD OSes, we need to define some value. Short of
|
||||||
|
@ -46,7 +46,7 @@ _can_export= yes
|
|||||||
.for var in ${_exported_vars}
|
.for var in ${_exported_vars}
|
||||||
.if defined(${var}) && (!defined(${var}__${${X_}_ld_hash}) || ${${var}__${${X_}_ld_hash}} != ${${var}})
|
.if defined(${var}) && (!defined(${var}__${${X_}_ld_hash}) || ${${var}__${${X_}_ld_hash}} != ${${var}})
|
||||||
.if defined(${var}__${${X_}_ld_hash})
|
.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
|
.endif
|
||||||
_can_export= no
|
_can_export= no
|
||||||
.endif
|
.endif
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
.for var in ${__DEFAULT_YES_OPTIONS}
|
.for var in ${__DEFAULT_YES_OPTIONS}
|
||||||
.if !defined(MK_${var})
|
.if !defined(MK_${var})
|
||||||
.if defined(WITH_${var}) && ${WITH_${var}} == "no"
|
.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
|
.endif
|
||||||
.if defined(WITHOUT_${var}) # WITHOUT always wins
|
.if defined(WITHOUT_${var}) # WITHOUT always wins
|
||||||
MK_${var}:= no
|
MK_${var}:= no
|
||||||
@ -46,7 +46,7 @@ MK_${var}:= yes
|
|||||||
.endif
|
.endif
|
||||||
.else
|
.else
|
||||||
.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
|
.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
|
||||||
.endif # !defined(MK_${var})
|
.endif # !defined(MK_${var})
|
||||||
.endfor
|
.endfor
|
||||||
@ -58,7 +58,7 @@ MK_${var}:= yes
|
|||||||
.for var in ${__DEFAULT_NO_OPTIONS}
|
.for var in ${__DEFAULT_NO_OPTIONS}
|
||||||
.if !defined(MK_${var})
|
.if !defined(MK_${var})
|
||||||
.if defined(WITH_${var}) && ${WITH_${var}} == "no"
|
.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
|
.endif
|
||||||
.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT always wins
|
.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT always wins
|
||||||
MK_${var}:= yes
|
MK_${var}:= yes
|
||||||
@ -67,7 +67,7 @@ MK_${var}:= no
|
|||||||
.endif
|
.endif
|
||||||
.else
|
.else
|
||||||
.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
|
.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
|
||||||
.endif # !defined(MK_${var})
|
.endif # !defined(MK_${var})
|
||||||
.endfor
|
.endfor
|
||||||
|
@ -124,7 +124,7 @@ __DEFAULT_YES_OPTIONS+=PIE
|
|||||||
WARNS \
|
WARNS \
|
||||||
WERROR
|
WERROR
|
||||||
.if defined(NO_${var})
|
.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
|
MK_${var}:=no
|
||||||
.endif
|
.endif
|
||||||
.endfor
|
.endfor
|
||||||
|
@ -24,7 +24,7 @@ _use_sanitizers= yes
|
|||||||
|
|
||||||
.if !defined(BOOTSTRAPPING) && ${_use_sanitizers} != "no" && \
|
.if !defined(BOOTSTRAPPING) && ${_use_sanitizers} != "no" && \
|
||||||
${COMPILER_TYPE} != "clang" && make(all)
|
${COMPILER_TYPE} != "clang" && make(all)
|
||||||
.error "Sanitizer instrumentation currently only supported with clang"
|
.error Sanitizer instrumentation currently only supported with clang
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# For libraries we only instrument the shared and PIE libraries by setting
|
# For libraries we only instrument the shared and PIE libraries by setting
|
||||||
|
@ -6,7 +6,7 @@ __netbsd_tests.test.mk__:
|
|||||||
TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H}
|
TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H}
|
||||||
|
|
||||||
.if !exists(${TESTSRC}/)
|
.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
|
.endif
|
||||||
|
|
||||||
.PATH: ${TESTSRC}
|
.PATH: ${TESTSRC}
|
||||||
|
Loading…
Reference in New Issue
Block a user