From 34e5a2da18f76c7d7de79a5c12b0e85ee89c4095 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 21 Jul 2015 18:20:33 +0200 Subject: Fix postponed re-examination logic Now postponed takes precedence over changed. --- build/bin/rule.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build/bin') diff --git a/build/bin/rule.cxx b/build/bin/rule.cxx index 0eb8363..f02029b 100644 --- a/build/bin/rule.cxx +++ b/build/bin/rule.cxx @@ -119,16 +119,16 @@ namespace build if (m1 != nullptr) { ts = execute (a, *m1); - if (ts == target_state::changed || - (ts == target_state::postponed && r == target_state::unchanged)) + if (ts == target_state::postponed || + (ts == target_state::changed && r == target_state::unchanged)) r = ts; } if (m2 != nullptr) { ts = execute (a, *m2); - if (ts == target_state::changed || - (ts == target_state::postponed && r == target_state::unchanged)) + if (ts == target_state::postponed || + (ts == target_state::changed && r == target_state::unchanged)) r = ts; } -- cgit v1.1