diff options
| author | Dmitry Goncharov <dgoncharov@users.sf.net> | 2022-12-18 09:49:34 -0500 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-12-18 20:06:38 -0500 |
| commit | 8f9e7722ff0f80d9f6ae9aba350ae02c3c6db878 (patch) | |
| tree | d82f8c39be040721f60cd5e7c9f05c4c7fd9b8f9 /src/output.c | |
| parent | 95c2db7b8d95529e00dd2988c0b3901a0cb9aa17 (diff) | |
| download | make-git-8f9e7722ff0f80d9f6ae9aba350ae02c3c6db878.tar.gz | |
[SV 63537] Fix setting -w in makefiles
* src/makeint.h: Replace print_directory flag with should_print_dir().
* src/main.c (main): Remove print_directory flag and related code.
(should_print_dir): Create.
* src/output.c (output_dump): Use should_print_dir().
(output_start): Ditto.
Diffstat (limited to 'src/output.c')
| -rw-r--r-- | src/output.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/output.c b/src/output.c index 22387dff..9122fee8 100644 --- a/src/output.c +++ b/src/output.c @@ -285,7 +285,8 @@ output_dump (struct output *out) } /* Log the working directory for this dump. */ - if (print_directory && output_sync != OUTPUT_SYNC_RECURSE) + + if (output_sync != OUTPUT_SYNC_RECURSE && should_print_dir ()) traced = log_working_directory (1); if (outfd_not_empty) @@ -369,7 +370,7 @@ output_start (void) /* If we're not syncing this output per-line or per-target, make sure we emit the "Entering..." message where appropriate. */ if (output_sync == OUTPUT_SYNC_NONE || output_sync == OUTPUT_SYNC_RECURSE) - if (! stdio_traced && print_directory) + if (! stdio_traced && should_print_dir ()) stdio_traced = log_working_directory (1); } |