mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-01-30 02:40:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Force intermediate targets to be considered if their non-intermediate

Browse source 
parent needs to be remade.  Fixes Savannah bug #30653.
This commit is contained in:
Paul Smith 2012-09-10 02:36:05 +00:00
parent a94b0b0ea5
commit fbe5b2c9cd
3 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2012-09-09 Paul Smith <psmith@gnu.org> 2012-09-09 Paul Smith <psmith@gnu.org>
* remake.c (update_file_1): Force intermediate files to be
considered, not pruned, if their non-intermediate parent needs to
be remade. Fixes Savannah bug #30653.
* job.c (construct_command_argv_internal): Keep the command line * job.c (construct_command_argv_internal): Keep the command line
on the heap for very long lines. Fixes Savannah bug #36451. on the heap for very long lines. Fixes Savannah bug #36451.

4
remake.c
View file

@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)
d->file->dontcare = file->dontcare; d->file->dontcare = file->dontcare;
} }
/* We may have already considered this file, when we didn't know
we'd need to update it. Force update_file() to consider it and
not prune it. */
d->file->considered = !considered;
dep_status |= update_file (d->file, depth); dep_status |= update_file (d->file, depth);

17
tests/scripts/features/parallelism
View file

@ -214,6 +214,23 @@ rm main.x");
rmfiles(qw(foo.y foo.y.in main.bar)); rmfiles(qw(foo.y foo.y.in main.bar));
} }
# Ensure intermediate/secondary files are not pruned incorrectly.
# See Savannah bug #30653
utouch(-15, 'file2');
utouch(-10, 'file4');
utouch(-5, 'file1');
run_make_test(q!
.INTERMEDIATE: file3
file4: file3 ; @mv -f $< $@
file3: file2 ; touch $@
file2: file1 ; @touch $@
!,
'--no-print-directory -j2', "touch file3");
#rmfiles('file1', 'file2', 'file3', 'file4');
if ($all_tests) { if ($all_tests) {
# Jobserver FD handling is messed up in some way. # Jobserver FD handling is messed up in some way.
# Savannah bug #28189 # Savannah bug #28189