|
 |
71dafe |
2012-09-09 Paul Smith <psmith@gnu.org>
|
|
|
71dafe |
|
|
|
71dafe |
* remake.c (update_file_1): Force intermediate files to be
|
|
|
71dafe |
considered, not pruned, if their non-intermediate parent needs to
|
|
|
71dafe |
be remade. Fixes Savannah bug #30653.
|
|
|
71dafe |
|
|
|
71dafe |
Index: remake.c
|
|
|
71dafe |
===================================================================
|
|
|
71dafe |
RCS file: /sources/make/make/remake.c,v
|
|
|
71dafe |
retrieving revision 1.153
|
|
|
71dafe |
retrieving revision 1.154
|
|
|
71dafe |
diff -u -r1.153 -r1.154
|
|
|
71dafe |
--- remake.c 5 Mar 2012 14:10:45 -0000 1.153
|
|
|
71dafe |
+++ remake.c 10 Sep 2012 02:36:05 -0000 1.154
|
|
|
71dafe |
@@ -612,6 +612,10 @@
|
|
|
71dafe |
d->file->dontcare = file->dontcare;
|
|
|
71dafe |
}
|
|
|
71dafe |
|
|
|
71dafe |
+ /* We may have already considered this file, when we didn't know
|
|
|
71dafe |
+ we'd need to update it. Force update_file() to consider it and
|
|
|
71dafe |
+ not prune it. */
|
|
|
71dafe |
+ d->file->considered = !considered;
|
|
|
71dafe |
|
|
|
71dafe |
dep_status |= update_file (d->file, depth);
|
|
|
71dafe |
|
|
|
71dafe |
Index: tests/scripts/features/parallelism
|
|
|
71dafe |
===================================================================
|
|
|
71dafe |
RCS file: /sources/make/make/tests/scripts/features/parallelism,v
|
|
|
71dafe |
retrieving revision 1.19
|
|
|
71dafe |
retrieving revision 1.20
|
|
|
71dafe |
diff -u -r1.19 -r1.20
|
|
|
71dafe |
--- tests/scripts/features/parallelism 4 Mar 2012 00:24:32 -0000 1.19
|
|
|
71dafe |
+++ tests/scripts/features/parallelism 10 Sep 2012 02:36:05 -0000 1.20
|
|
|
71dafe |
@@ -214,6 +214,23 @@
|
|
|
71dafe |
rmfiles(qw(foo.y foo.y.in main.bar));
|
|
|
71dafe |
}
|
|
|
71dafe |
|
|
|
71dafe |
+# Ensure intermediate/secondary files are not pruned incorrectly.
|
|
|
71dafe |
+# See Savannah bug #30653
|
|
|
71dafe |
+
|
|
|
71dafe |
+utouch(-15, 'file2');
|
|
|
71dafe |
+utouch(-10, 'file4');
|
|
|
71dafe |
+utouch(-5, 'file1');
|
|
|
71dafe |
+
|
|
|
71dafe |
+run_make_test(q!
|
|
|
71dafe |
+.INTERMEDIATE: file3
|
|
|
71dafe |
+file4: file3 ; @mv -f $< $@
|
|
|
71dafe |
+file3: file2 ; touch $@
|
|
|
71dafe |
+file2: file1 ; @touch $@
|
|
|
71dafe |
+!,
|
|
|
71dafe |
+ '--no-print-directory -j2', "touch file3");
|
|
|
71dafe |
+
|
|
|
71dafe |
+#rmfiles('file1', 'file2', 'file3', 'file4');
|
|
|
71dafe |
+
|
|
|
71dafe |
if ($all_tests) {
|
|
|
71dafe |
# Jobserver FD handling is messed up in some way.
|
|
|
71dafe |
# Savannah bug #28189
|