aboutsummaryrefslogtreecommitdiff
path: root/build2/cc/compile-rule.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-04-04 16:48:08 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-04-04 16:48:08 +0200
commitbb3da2b1f00a2e4c82e2994fbd1bdf8040cdc598 (patch)
tree2df20d2a190c401b0189ea318b834870175d153b /build2/cc/compile-rule.hxx
parentf7cfd4eb4163da69f9fbb1d756e91cdf0307756a (diff)
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.
Diffstat (limited to 'build2/cc/compile-rule.hxx')
-rw-r--r--build2/cc/compile-rule.hxx4
1 files changed, 1 insertions, 3 deletions
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>