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 | 7f72f33c498ba39f5f4900642b63ec6e89c471e6 (patch) | |
| tree | 5e54e249640337422fc4b87d0213ee72a427320c /CC/proto | |
| parent | 16d5cf721477348c77b7735160d257fbd522323f (diff) | |
| download | rules-cc-7f72f33c498ba39f5f4900642b63ec6e89c471e6.tar.gz | |
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.
Diffstat (limited to 'CC/proto')
| -rw-r--r-- | CC/proto/RULES | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/CC/proto/RULES b/CC/proto/RULES index 8108161..65b8a7a 100644 --- a/CC/proto/RULES +++ b/CC/proto/RULES @@ -56,6 +56,7 @@ } , "imports": { "base-provides": ["./", "..", "defaults-base-provides"] + , "base-provides-++": ["./", "..", "defaults-base-provides-++"] , "base-provides-list": ["./", "..", "defaults-base-provides-list"] , "artifacts_list": ["", "field_artifacts_list"] , "nub_left": ["", "nub_left"] @@ -91,7 +92,7 @@ , { "type": "if" , "cond": {"type": "var", "name": "LDFLAGS"} , "then": {"type": "var", "name": "LDFLAGS"} - , "else": {"type": "CALL_EXPRESSION", "name": "base-provides"} + , "else": {"type": "CALL_EXPRESSION", "name": "base-provides-++"} } ] , ["provider", "GRPC_PLUGIN"] @@ -107,9 +108,7 @@ , { "type": "++" , "$1": [ {"type": "var", "name": "PATH"} - , { "type": "++" - , "$1": {"type": "CALL_EXPRESSION", "name": "base-provides-list"} - } + , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} ] } ] |