summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2013-04-06 10:29:20 -0400
committerPaul Smith <psmith@gnu.org>2013-04-06 10:29:20 -0400
commit29cd1e9699d1101444920827b412191e0f92e1e1 (patch)
treefe8e0428a0d7afeda283539fb5d6d7030edaa8ea
parent450b7e1a3d3f0b9c84f9b8f6909fa844afacbec5 (diff)
downloadgunmake-29cd1e9699d1101444920827b412191e0f92e1e1.tar.gz
Reconsider targets waiting for prerequisites. Fixes Savannah bug #37703.
-rw-r--r--ChangeLog5
-rw-r--r--remake.c9
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8dc920a..1318e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-06 Paul Smith <psmith@gnu.org>
+
+ * remake.c (check_dep): Reconsider files waiting on prerequisites,
+ as they may have finished. Fixes Savannah bug #37703.
+
2013-02-28 Paul Smith <psmith@gnu.org>
* function.c (func_realpath): On Solaris (at least) realpath() can
diff --git a/remake.c b/remake.c
index 8510264..788d489 100644
--- a/remake.c
+++ b/remake.c
@@ -1046,7 +1046,14 @@ check_dep (struct file *file, unsigned int depth,
fresh. It could be it was checked as part of an order-only
prerequisite and so wasn't rebuilt then, but should be now. */
if (file->command_state != cs_running)
- set_command_state (file, cs_not_started);
+ {
+ /* If the target was waiting for a dependency it has to be
+ reconsidered, as that dependency might have finished. */
+ if (file->command_state == cs_deps_running)
+ file->considered = !considered;
+
+ set_command_state (file, cs_not_started);
+ }
ld = 0;
d = file->deps;