From 29cd1e9699d1101444920827b412191e0f92e1e1 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 6 Apr 2013 10:29:20 -0400 Subject: [PATCH] Reconsider targets waiting for prerequisites. Fixes Savannah bug #37703. --- ChangeLog | 5 +++++ remake.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8dc920a4..1318e5bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-04-06 Paul Smith + + * remake.c (check_dep): Reconsider files waiting on prerequisites, + as they may have finished. Fixes Savannah bug #37703. + 2013-02-28 Paul Smith * function.c (func_realpath): On Solaris (at least) realpath() can diff --git a/remake.c b/remake.c index 85102648..788d489f 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;