diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-02-28 17:34:32 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-02-28 17:34:32 +0100 |
| commit | dc432708c61d347f78d61bde7721e00a23617f02 (patch) | |
| tree | 96c78fffbd96bd1d9fe9546dfb485ee79f4c8a0c /rules | |
| parent | 0ae82631426f41fb94ebf85f7a997eda80945760 (diff) | |
| parent | c0a0bbf4c3cd92c9d740bb6a965bad8a9b938d20 (diff) | |
| download | rules-cc-dc432708c61d347f78d61bde7721e00a23617f02.tar.gz | |
Merge commit 'c0a0bbf4c3cd92c9d740bb6a965bad8a9b938d20' into rules-cc
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/CC/prebuilt/EXPRESSIONS | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/rules/CC/prebuilt/EXPRESSIONS b/rules/CC/prebuilt/EXPRESSIONS index fc901d7..6bfd874 100644 --- a/rules/CC/prebuilt/EXPRESSIONS +++ b/rules/CC/prebuilt/EXPRESSIONS @@ -143,12 +143,12 @@ , "cond": {"type": "var", "name": "shared"} , "then": [] , "else": - { "type": "foreach" - , "var": "lib" - , "range": {"type": "var", "name": "staged-libs"} - , "body": - { "type": "join" - , "$1": {"type": "keys", "$1": {"type": "var", "name": "lib"}} + { "type": "++" + , "$1": + { "type": "foreach" + , "var": "libs" + , "range": {"type": "var", "name": "staged-libs"} + , "body": {"type": "keys", "$1": {"type": "var", "name": "libs"}} } } } @@ -157,12 +157,12 @@ , { "type": "if" , "cond": {"type": "var", "name": "shared"} , "then": - { "type": "foreach" - , "var": "lib" - , "range": {"type": "var", "name": "staged-libs"} - , "body": - { "type": "join" - , "$1": {"type": "keys", "$1": {"type": "var", "name": "lib"}} + { "type": "++" + , "$1": + { "type": "foreach" + , "var": "libs" + , "range": {"type": "var", "name": "staged-libs"} + , "body": {"type": "keys", "$1": {"type": "var", "name": "libs"}} } } } @@ -248,7 +248,16 @@ ] , [ "main-pkg-config" , { "type": "foldl" - , "range": {"type": "var", "name": "pkg-configs", "default": []} + , "range": + { "type": "++" + , "$1": + { "type": "foreach" + , "var": "configs" + , "range": {"type": "var", "name": "pkg-configs", "default": []} + , "body": + {"type": "keys", "$1": {"type": "var", "name": "configs"}} + } + } , "start": null , "accum_var": "name" , "var": "config" @@ -256,10 +265,7 @@ { "type": "if" , "cond": {"type": "var", "name": "name"} , "then": {"type": "var", "name": "name"} - , "else": - { "type": "join" - , "$1": {"type": "keys", "$1": {"type": "var", "name": "config"}} - } + , "else": {"type": "var", "name": "config"} } } ] |