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/cli | |
| parent | d263455d5ac0d87541144dd7a37eb6255b721a89 (diff) | |
Implement target_set locking, including extension update
Diffstat (limited to 'build2/cli')
| -rw-r--r-- | build2/cli/rule.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx index 262e89a..9f54950 100644 --- a/build2/cli/rule.cxx +++ b/build2/cli/rule.cxx @@ -88,15 +88,15 @@ namespace build2 // if (t.h == nullptr) { - t.h = &search<cxx::hxx> (t.dir, t.out, t.name, nullopt, nullptr); + t.h = &search<cxx::hxx> (t.dir, t.out, t.name, nullptr, nullptr); t.h->group = &t; - t.c = &search<cxx::cxx> (t.dir, t.out, t.name, nullopt, nullptr); + t.c = &search<cxx::cxx> (t.dir, t.out, t.name, nullptr, nullptr); t.c->group = &t; if (!find_option ("--suppress-inline", t, "cli.options")) { - t.i = &search<cxx::ixx> (t.dir, t.out, t.name, nullopt, nullptr); + t.i = &search<cxx::ixx> (t.dir, t.out, t.name, nullptr, nullptr); t.i->group = &t; } } @@ -211,10 +211,8 @@ namespace build2 const char* option, const char* default_extension) { - // Should have been figured out in apply(). - // - const optional<string>& e (*t.ext_); - assert (e); + const string* e (t.ext ()); + assert (e != nullptr); // Should have been figured out in apply(). if (*e != default_extension) { |