aboutsummaryrefslogtreecommitdiff
path: root/build/cli
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-07-21 18:20:33 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-07-22 12:26:34 +0200
commit34e5a2da18f76c7d7de79a5c12b0e85ee89c4095 (patch)
tree3e825e3883bc1ed083b0c33afa30c74c95dbef1e /build/cli
parenta1cec9e0df14f3c1a833e2a447b5324ff9c430d3 (diff)
Fix postponed re-examination logic
Now postponed takes precedence over changed.
Diffstat (limited to 'build/cli')
-rw-r--r--build/cli/rule.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/cli/rule.cxx b/build/cli/rule.cxx
index 9abe665..dff13f0 100644
--- a/build/cli/rule.cxx
+++ b/build/cli/rule.cxx
@@ -294,7 +294,7 @@ namespace build
//
target_state ts (reverse_execute_prerequisites (a, t));
- return r ? target_state::changed : ts;
+ return r && ts != target_state::postponed ? target_state::changed : ts;
}
}
}