diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-02 15:35:44 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-13 12:42:41 +0200 |
| commit | 63f6a8256e3f9fb47cb941be63baa70e2be48d3b (patch) | |
| tree | d2799d1d605a27fa0a13d63f974f26fa78306e36 /build2/algorithm.cxx | |
| parent | d263455d5ac0d87541144dd7a37eb6255b721a89 (diff) | |
Implement target_set locking, including extension update
Diffstat (limited to 'build2/algorithm.cxx')
| -rw-r--r-- | build2/algorithm.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx index e8e7777..734c545 100644 --- a/build2/algorithm.cxx +++ b/build2/algorithm.cxx @@ -53,7 +53,13 @@ namespace build2 // @@ OUT: for now we assume the prerequisite's out is undetermined. // Would need to pass a pair of names. // - return search (*tt, n.dir, dir_path (), n.value, ext, &s, n.proj); + return search (*tt, + n.dir, + dir_path (), + n.value, + ext ? &*ext : nullptr, + &s, + n.proj); } target* @@ -374,7 +380,7 @@ namespace build2 // Target is in the out tree, so out directory is empty. // - fsdir* r (&search<fsdir> (d, dir_path (), string (), nullopt, nullptr)); + fsdir* r (&search<fsdir> (d, dir_path (), string (), nullptr, nullptr)); match (ml, a, *r); t.prerequisite_targets.emplace_back (r); return r; |