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/search.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build2/search.cxx')

diff --git a/build2/search.cxx b/build2/search.cxx
index a7d40c6..f0b163a 100644
--- a/build2/search.cxx
+++ b/build2/search.cxx
@@ -102,7 +102,9 @@ namespace build2
 
     if (!ext)
     {
-      if (auto f = ctk.type->extension)
+      if (auto f = ctk.type->fixed_extension)
+        ext = f (ctk);
+      else if (auto f = ctk.type->default_extension)
         ext = f (ctk, *s, true);
 
       if (!ext)
-- 
cgit v1.1