defaults: Fix flag inheritance

... which should accumulate values from all base targets
unless the flag type (CFLAGS, CXXFLAGS, or LDFLAGS) is
explicity overwritten by the inheritor.

1 files changed, 13 insertions, 0 deletions

diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS
index 1f57fcd..c4a3e34 100644
--- a/CC/EXPRESSIONS
+++ b/CC/EXPRESSIONS
@@ -153,6 +153,19 @@
     , "body": {"type": "CALL_EXPRESSION", "name": "provider_list"}
     }
   }
+, "defaults-base-provides-++":
+  { "doc": ["Query flattend list of providers from 'base' targets"]
+  , "vars": ["provider", "default"]
+  , "vars_doc":
+    { "provider": ["The name of the provider in the provides map."]
+    , "default": ["The default if provider is missing (default: [])."]
+    }
+  , "imports": {"base-provides-list": "defaults-base-provides-list"}
+  , "expression":
+    { "type": "++"
+    , "$1": {"type": "CALL_EXPRESSION", "name": "base-provides-list"}
+    }
+  }
 , "defaults-base-provides":
   { "doc": ["Query provider from 'base' targets (last wins)"]
   , "vars": ["provider", "default"]