mirror of
https://github.com/mirror/make.git
synced 2025-01-29 22:00:54 +08:00
07187db947
Appending to a pattern specific variable produces an incorrect value in the presence of a command line definition or an env override of the variable. Also, fix pattern/target-specific appending to a variable with origin override. * At parse time record_target_var sets the value of a pattern specific variable to the value defined on command line or to the value of the env override. * Later, at build time, recursively_expand_for_file appends this value of the variable (set in record_target_var) to the command line value again, regardless of the origin of the variable. This patch modifies recursively_expand_for_file to avoid appending, unless the origin of the variable beats or equals the origin of one of the parent definitions of this variable. Reported by Rob <robw9739@gmail.com>, Brian Vandenberg <phantall@gmail.com>, Markus Oberhumer <markus@oberhumer.com>. * NEWS: Note the change. * src/variable.c (do_variable_definition): Avoid merging a pattern-specific variable with the parent definition when a command line or env override is present. * src/expand.c (recursively_expand_for_file): Avoid appending to a pattern-specific variable, unless the origin of this pattern-specific variable beats or equals the origin of one of the parent definitions of this variable. * doc/make.texi (Override Directive): Add missing cross-reference. * tests/scripts/variables/append: Add tests. |
||
|---|---|---|
| .. | ||
| append | ||
| automatic | ||
| conditional | ||
| CURDIR | ||
| DEFAULT_GOAL | ||
| define | ||
| EXTRA_PREREQS | ||
| flavors | ||
| GNUMAKEFLAGS | ||
| INCLUDE_DIRS | ||
| LIBPATTERNS | ||
| MAKE | ||
| MAKE_RESTARTS | ||
| MAKECMDGOALS | ||
| MAKEFILES | ||
| MAKEFLAGS | ||
| MAKELEVEL | ||
| MFILE_LIST | ||
| negative | ||
| private | ||
| SHELL | ||
| special | ||
| undefine | ||
| WARNINGS | ||