From 63f6a8256e3f9fb47cb941be63baa70e2be48d3b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 2 Feb 2017 15:35:44 +0200 Subject: Implement target_set locking, including extension update --- build2/cc/compile.cxx | 2 +- build2/cc/link.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'build2/cc') 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 (*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. -- cgit v1.1