aboutsummaryrefslogtreecommitdiff
path: root/build/cxx/compile.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-08-29 08:14:27 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-08-29 08:14:27 +0200
commit2a9d673f298b623db061ee85d397563d644c8268 (patch)
tree7fa40a9d364f710e3aa7438e273287f14eace725 /build/cxx/compile.cxx
parentfd689eb883655dcb29e505b041cd02fac01f0bac (diff)
New configure meta-operation implementation
Now we search and match (but do not execute) a rule for every operation supported by the project.
Diffstat (limited to 'build/cxx/compile.cxx')
-rw-r--r--build/cxx/compile.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/build/cxx/compile.cxx b/build/cxx/compile.cxx
index bb42c30..514c57a 100644
--- a/build/cxx/compile.cxx
+++ b/build/cxx/compile.cxx
@@ -129,11 +129,12 @@ namespace build
t.prerequisite_targets.push_back (&pt);
}
- // Inject additional prerequisites. We only do it for update
- // since chances are we will have to update some of our
- // prerequisites in the process (auto-generated source code).
+ // Inject additional prerequisites. We only do it when
+ // performing update since chances are we will have to
+ // update some of our prerequisites in the process (auto-
+ // generated source code).
//
- if (a.operation () == update_id)
+ if (a == perform_update_id)
{
// The cached prerequisite target should be the same as what
// is in t.prerequisite_targets since we used standard
@@ -151,7 +152,7 @@ namespace build
{
case perform_update_id: return &perform_update;
case perform_clean_id: return &perform_clean;
- default: assert (false); return default_recipe;
+ default: return noop_recipe; // Configure update.
}
}