From 63f6a8256e3f9fb47cb941be63baa70e2be48d3b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 2 Feb 2017 15:35:44 +0200
Subject: Implement target_set locking, including extension update

---
 build2/cli/rule.cxx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'build2/cli')

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)
       {
-- 
cgit v1.1