summaryrefslogtreecommitdiff
path: root/patch
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-11-16 16:41:38 +0100
committerOliver Reiche <oliver.reiche@huawei.com>2023-11-20 16:01:56 +0100
commita513b2e823dc6a2e37ae1fad6924b3d5c34dabf0 (patch)
tree14aea175d8ddad8625b59fc9e4b200332674857b /patch
parentd414173d43fb4e8e6660752ba8b30cd5310f8789 (diff)
downloadrules-cc-a513b2e823dc6a2e37ae1fad6924b3d5c34dabf0.tar.gz
rules: 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.
Diffstat (limited to 'patch')
-rw-r--r--patch/RULES5
1 files changed, 2 insertions, 3 deletions
diff --git a/patch/RULES b/patch/RULES
index f57094a..446f842 100644
--- a/patch/RULES
+++ b/patch/RULES
@@ -29,6 +29,7 @@
, "config_vars": ["ARCH", "HOST_ARCH"]
, "imports":
{ "base-provides": ["CC", "defaults-base-provides"]
+ , "base-provides-++": ["CC", "defaults-base-provides-++"]
, "base-provides-list": ["CC", "defaults-base-provides-list"]
, "artifacts_list": ["", "field_artifacts_list"]
, "nub_left": ["", "nub_left"]
@@ -54,9 +55,7 @@
, { "type": "++"
, "$1":
[ {"type": "var", "name": "PATH"}
- , { "type": "++"
- , "$1": {"type": "CALL_EXPRESSION", "name": "base-provides-list"}
- }
+ , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
]
}
]