From 17305d124705d9ab8cd89d1355f4ec6aacbf540a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 6 May 2021 09:57:03 +0200 Subject: Propagate complete match rules from utility libraries in link rule This makes sure mixed-language (e.g., C and C++) utility libraries behave as expected. --- libbuild2/cc/link-rule.hxx | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libbuild2/cc/link-rule.hxx') diff --git a/libbuild2/cc/link-rule.hxx b/libbuild2/cc/link-rule.hxx index 33a4f1c..c49d20f 100644 --- a/libbuild2/cc/link-rule.hxx +++ b/libbuild2/cc/link-rule.hxx @@ -32,6 +32,16 @@ namespace build2 bool seen_cc = false; bool seen_obj = false; bool seen_lib = false; + + match_result& operator|= (match_result y) + { + seen_x = seen_x || y.seen_x; + seen_c = seen_c || y.seen_c; + seen_cc = seen_cc || y.seen_cc; + seen_obj = seen_obj || y.seen_obj; + seen_lib = seen_lib || y.seen_lib; + return *this; + } }; match_result -- cgit v1.1