From bb3da2b1f00a2e4c82e2994fbd1bdf8040cdc598 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 4 Apr 2019 16:48:08 +0200
Subject: Add support for extension-to-target type mapping ambiguity resolution

The typical case is h{} and hxx{} using the same .h extension. This was
generally not a problem except for auto-generated headers. Now this is
resolved by looking up the actual target.
---
 build2/cc/compile-rule.hxx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'build2/cc/compile-rule.hxx')

diff --git a/build2/cc/compile-rule.hxx b/build2/cc/compile-rule.hxx
index a621414..b89a918 100644
--- a/build2/cc/compile-rule.hxx
+++ b/build2/cc/compile-rule.hxx
@@ -106,9 +106,7 @@ namespace build2
       prefix_map
       build_prefix_map (const scope&, action, target&, linfo) const;
 
-      // Reverse-lookup target type from extension.
-      //
-      const target_type*
+      small_vector<const target_type*, 2>
       map_extension (const scope&, const string&, const string&) const;
 
       pair<auto_rmfile, bool>
-- 
cgit v1.1