diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-16 16:41:38 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-20 16:01:56 +0100 |
| commit | 3a1a1e855fee6f74e14c1626cdf84efe119936c3 (patch) | |
| tree | 43be80553cafc2ee66a3e2236d6c22a03ce9e453 /rules/patch | |
| parent | 670eec4953f923b2ee6c00edccd6fbad66bd0641 (diff) | |
| download | justbuild-3a1a1e855fee6f74e14c1626cdf84efe119936c3.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 'rules/patch')
| -rw-r--r-- | rules/patch/RULES | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rules/patch/RULES b/rules/patch/RULES index f57094a5..446f8428 100644 --- a/rules/patch/RULES +++ b/rules/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-++"} ] } ] |