diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-25 15:41:44 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-13 12:39:24 +0200 |
| commit | 88f0780e34116c0441a8d8c58b8a8fd9fde4b1f5 (patch) | |
| tree | 1240b36211772479dc1220712e0daed4e35ecd85 /build2/cc/install.cxx | |
| parent | 61aa8e2b4bd7849838c04dc1f421c4760d88319f (diff) | |
Add model mutex, make var_pool const by default
Diffstat (limited to 'build2/cc/install.cxx')
| -rw-r--r-- | build2/cc/install.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build2/cc/install.cxx b/build2/cc/install.cxx index 28d7db2..074654b 100644 --- a/build2/cc/install.cxx +++ b/build2/cc/install.cxx @@ -23,7 +23,7 @@ namespace build2 install (data&& d, const link& l): common (move (d)), link_ (l) {} target* install:: - filter (action a, target& t, prerequisite_member p) const + filter (slock& ml, action a, target& t, prerequisite_member p) const { if (t.is_a<exe> ()) { @@ -53,11 +53,11 @@ namespace build2 return pt->in (t.weak_scope ()) ? pt : nullptr; } - return file_rule::filter (a, t, p); + return file_rule::filter (ml, a, t, p); } match_result install:: - match (action a, target& t, const string& hint) const + match (slock& ml, action a, target& t, const string& hint) const { // @@ How do we split the hint between the two? // @@ -65,8 +65,8 @@ namespace build2 // We only want to handle installation if we are also the // ones building this target. So first run link's match(). // - match_result r (link_.match (a, t, hint)); - return r ? install::file_rule::match (a, t, "") : r; + match_result r (link_.match (ml, a, t, hint)); + return r ? install::file_rule::match (ml, a, t, "") : r; } void install:: |