From 53f02bf28dae507a51515ed6ac03226d68816494 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 2 Feb 2017 10:20:50 +0200
Subject: Store extension in target map key rather than in target

This is in preparation for locking its modification/access.
---
 build2/cc/compile.cxx   | 2 +-
 build2/cc/link.cxx      | 2 +-
 build2/cc/pkgconfig.cxx | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'build2/cc')

diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 2176b82..1fed762 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -422,7 +422,7 @@ namespace build2
         // only use the target type and name from the target key so we can
         // pass bogus values for the rest.
         //
-        target_key tk {&tt, nullptr, nullptr, &n, target_key::nullext};
+        target_key tk {&tt, nullptr, nullptr, &n, nullopt};
 
         // This is like prerequisite search.
         //
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index d85faed..7798c95 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -549,7 +549,7 @@ namespace build2
           }
 
           if (pt == nullptr)
-            pt = &search (ott, o.dir, o.out, o.name, o.ext, nullptr);
+            pt = &search (ott, o.dir, o.out, o.name, o.ext (), nullptr);
         }
         else
           pt = &ot;
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index d32cd61..da6614f 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -419,9 +419,7 @@ namespace build2
           string name (l, 2); // Sans -l.
 
           prerequisite_key pk {
-            nullopt,
-            {&lib::static_type, &out, &out, &name, target_key::nullext},
-            &s};
+            nullopt, {&lib::static_type, &out, &out, &name, nullopt}, &s};
 
           if (lib* lt = static_cast<lib*> (search_library (sysd, usrd, pk)))
           {
-- 
cgit v1.1