Module Name: src
Committed By: rillig
Date: Sat Jan 11 20:54:46 UTC 2025
Modified Files:
src/usr.bin/make: cond.c var.c
src/usr.bin/make/unit-tests: cond-func-empty.exp cond-func-empty.mk
cond-token-string.exp cond-token-string.mk cond-undef-lint.exp
cond-undef-lint.mk opt-debug-lint.exp opt-debug-lint.mk
var-eval-short.exp var-eval-short.mk vardebug.exp vardebug.mk
varmod-edge.exp varmod-edge.mk varmod-gmtime.exp varmod-gmtime.mk
varmod-ifelse.exp varmod-ifelse.mk varmod-localtime.exp
varmod-localtime.mk varmod-loop-varname.exp varmod-loop-varname.mk
varmod-match.exp varmod-match.mk varmod-mtime.exp varmod-mtime.mk
varmod-order.exp varmod-order.mk varmod-range.exp varmod-range.mk
varmod-sysv.exp varmod-sysv.mk varmod-to-separator.exp
varmod-to-separator.mk varmod.exp varmod.mk
Log Message:
make: omit redundant follow-up message "Malformed conditional"
If there is a parse error or an evaluation error during the conditional,
the conditional is already mentioned in the "while evaluating condition"
line, so there's no reason to repeat it once again.
Same for the "Bad condition" message from the '?:' modifier.
To generate a diff of this commit:
cvs rdiff -u -r1.369 -r1.370 src/usr.bin/make/cond.c
cvs rdiff -u -r1.1142 -r1.1143 src/usr.bin/make/var.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-func-empty.exp
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/cond-func-empty.mk
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/cond-token-string.exp \
src/usr.bin/make/unit-tests/var-eval-short.mk \
src/usr.bin/make/unit-tests/varmod-order.exp \
src/usr.bin/make/unit-tests/varmod-sysv.exp
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/cond-token-string.mk \
src/usr.bin/make/unit-tests/vardebug.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-undef-lint.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-undef-lint.mk
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/opt-debug-lint.exp \
src/usr.bin/make/unit-tests/varmod-gmtime.exp \
src/usr.bin/make/unit-tests/varmod-match.exp
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/opt-debug-lint.mk \
src/usr.bin/make/unit-tests/varmod-sysv.mk \
src/usr.bin/make/unit-tests/varmod.mk
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/make/unit-tests/var-eval-short.exp \
src/usr.bin/make/unit-tests/varmod-edge.mk
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/make/unit-tests/varmod-edge.exp \
src/usr.bin/make/unit-tests/varmod-match.mk
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/unit-tests/varmod-gmtime.mk
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/unit-tests/varmod-ifelse.exp
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/make/unit-tests/varmod-ifelse.mk
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varmod-localtime.exp \
src/usr.bin/make/unit-tests/varmod-localtime.mk
cvs rdiff -u -r1.12 -r1.13 \
src/usr.bin/make/unit-tests/varmod-loop-varname.exp
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/varmod-loop-varname.mk \
src/usr.bin/make/unit-tests/varmod-mtime.exp
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varmod-mtime.mk
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/varmod-order.mk \
src/usr.bin/make/unit-tests/varmod-range.exp \
src/usr.bin/make/unit-tests/varmod.exp
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-range.mk
cvs rdiff -u -r1.18 -r1.19 \
src/usr.bin/make/unit-tests/varmod-to-separator.exp
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/varmod-to-separator.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
