Module Name: src
Committed By: rillig
Date: Sat Jan 11 21:21:34 UTC 2025
Modified Files:
src/usr.bin/make: cond.c make.h var.c
src/usr.bin/make/unit-tests: cond-op-and.exp cond-op-and.mk
cond-op-or.exp cond-op-or.mk cond-token-var.exp cond-token-var.mk
cond-undef-lint.exp cond-undef-lint.mk dep-var.exp
deptgt-makeflags.exp directive-export-impl.exp
directive-include-fatal.exp directive-include-fatal.mk
opt-debug-var.exp opt-debug-var.mk var-op-shell.exp var-op-shell.mk
vardebug.exp vardebug.mk varmod-assign-shell.exp
varmod-assign-shell.mk varmod-assign.exp varmod-match-escape.exp
varname-dot-shell.exp varname-dot-suffixes.exp varname.exp
varparse-dynamic.exp varparse-dynamic.mk
Log Message:
make: replace "Malformed conditional" with "Variable is undefined"
Evaluating a conditional such as ".if ${UNDEF}" produced a "Malformed
conditional" error, even though the form of the conditional was correct,
it was the content of the variable that was wrong.
Replace this message with the more accurate "Variable is undefined",
revealing which of the possibly many variables is actually undefined.
To generate a diff of this commit:
cvs rdiff -u -r1.370 -r1.371 src/usr.bin/make/cond.c
cvs rdiff -u -r1.347 -r1.348 src/usr.bin/make/make.h
cvs rdiff -u -r1.1143 -r1.1144 src/usr.bin/make/var.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-op-and.exp \
src/usr.bin/make/unit-tests/cond-token-var.exp
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-op-and.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-op-or.exp \
src/usr.bin/make/unit-tests/cond-undef-lint.mk \
src/usr.bin/make/unit-tests/var-op-shell.exp
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/cond-op-or.mk
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/cond-token-var.mk \
src/usr.bin/make/unit-tests/var-op-shell.mk \
src/usr.bin/make/unit-tests/varmod-assign-shell.exp \
src/usr.bin/make/unit-tests/varmod-assign-shell.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cond-undef-lint.exp \
src/usr.bin/make/unit-tests/dep-var.exp \
src/usr.bin/make/unit-tests/deptgt-makeflags.exp \
src/usr.bin/make/unit-tests/varname-dot-suffixes.exp
cvs rdiff -u -r1.19 -r1.20 \
src/usr.bin/make/unit-tests/directive-export-impl.exp
cvs rdiff -u -r1.5 -r1.6 \
src/usr.bin/make/unit-tests/directive-include-fatal.exp \
src/usr.bin/make/unit-tests/directive-include-fatal.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-debug-var.exp \
src/usr.bin/make/unit-tests/opt-debug-var.mk \
src/usr.bin/make/unit-tests/varparse-dynamic.exp
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/vardebug.mk
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/make/unit-tests/varmod-assign.exp
cvs rdiff -u -r1.25 -r1.26 \
src/usr.bin/make/unit-tests/varmod-match-escape.exp
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/varname-dot-shell.exp \
src/usr.bin/make/unit-tests/varname.exp
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/varparse-dynamic.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
