mirror of
https://github.com/mirror/make.git
synced 2025-01-10 20:30:20 +08:00
8e024a2532
Previously if --no-print-directory was seen anywhere even once (environment, command line, etc.) it would always take precedence over any --print-directory option. Change this so that the last seen option (which will be the command line, if present there) takes precedence. * NEWS: Mark this change in behavior. * src/makeint.h (print_directory): A new variable to control printing. * src/output.c (output_dump): Use the new variable. (output_start): Ditto. * src/main.c: Add a new variable print_directory. Use -1 for print_directory_flag so we know of the option was seen or not. Add a new default_print_directory_flag set to -1 to keep options from being added. (switches): Use flag_off for --no-print-directory, rather than a separate inhibit_print_directory_flag. (main): If print_directory_flag was set by the user, use that for print_directory. If not, compute the print_directory value based on -s, -C, and sub-makes as before. * tests/scripts/variables/GNUMAKEFLAGS: -w is not added automatically * tests/scripts/options/print-directory: Add tests for overriding print-directory options. |
||
---|---|---|
.. | ||
automatic | ||
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 |