From a89f1e4f4efd291beedea03c65c8185b7d0df20e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 7 Dec 2017 12:06:59 +0200
Subject: Distinguish between "fixed" and "default" target extensions

This fixes wrong merging of, say, file{README} and file{README.MySQL}
(in libmysqlclient).
---
 build2/context.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build2/context.cxx')

diff --git a/build2/context.cxx b/build2/context.cxx
index b359d8f..b12920c 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -339,6 +339,8 @@ namespace build2
 
   const variable* var_clean;
 
+  const char var_extension[10] = "extension";
+
   const string* current_mname;
   const string* current_oname;
 
@@ -413,7 +415,7 @@ namespace build2
 
     // Target extension.
     //
-    vp.insert<string> ("extension", variable_visibility::target);
+    vp.insert<string> (var_extension, variable_visibility::target);
 
     gs.assign<dir_path> ("build.work") = work;
     gs.assign<dir_path> ("build.home") = home;
-- 
cgit v1.1