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/cc | |
| parent | d263455d5ac0d87541144dd7a37eb6255b721a89 (diff) | |
Implement target_set locking, including extension update
Diffstat (limited to 'build2/cc')
| -rw-r--r-- | build2/cc/compile.cxx | 2 | ||||
| -rw-r--r-- | build2/cc/link.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index 590ba7c..66ea9bd 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -974,7 +974,7 @@ namespace build2 // target* r; if (insert) - r = &search (*tt, d, out, n, e, nullptr); + r = &search (*tt, d, out, n, &e, nullptr); else { // Note that we skip any target type-specific searches (like for diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx index 7798c95..83a7c0d 100644 --- a/build2/cc/link.cxx +++ b/build2/cc/link.cxx @@ -337,7 +337,7 @@ namespace build2 if (t.member != nullptr) // Might already be there. assert (t.member->type () == tt); else - t.member = &search (tt, t.dir, t.out, t.name, nullopt, nullptr); + t.member = &search (tt, t.dir, t.out, t.name, nullptr, nullptr); file& r (static_cast<file&> (*t.member)); r.recipe (a, group_recipe); @@ -519,7 +519,7 @@ namespace build2 // obj*{} is always in the out tree. // target& ot ( - search (tt, d, dir_path (), *cp.tk.name, nullopt, cp.scope)); + search (tt, d, dir_path (), *cp.tk.name, nullptr, cp.scope)); // If we are cleaning, check that this target is in the same or // a subdirectory of our project root. |