diff options
author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-11-06 14:45:05 +0100 |
---|---|---|
committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-11-06 14:45:05 +0100 |
commit | 9daa85fed4535baecc092133aab337bd27726ff2 (patch) | |
tree | 0629c28148d2944e49ecdacf1fa1424a0e17ea0a /rules/CC/foreign/shell | |
parent | 02490fb528ed90702eb4b71917f33ec9aa894252 (diff) | |
parent | 2b07a15b20ed814f253ec3bc7f0ee089ccd066f2 (diff) | |
download | rules-cc-9daa85fed4535baecc092133aab337bd27726ff2.tar.gz |
Merge subtree 'rules' into rules-cc
Diffstat (limited to 'rules/CC/foreign/shell')
-rw-r--r-- | rules/CC/foreign/shell/EXPRESSIONS | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/rules/CC/foreign/shell/EXPRESSIONS b/rules/CC/foreign/shell/EXPRESSIONS index a1dcd0c..a37d315 100644 --- a/rules/CC/foreign/shell/EXPRESSIONS +++ b/rules/CC/foreign/shell/EXPRESSIONS @@ -22,7 +22,6 @@ ] , "imports": { "artifacts": ["", "field_artifacts"] - , "nub_left": ["", "nub_left"] , "flags-cc": ["CC", "flags-cc"] , "flags-cxx": ["CC", "flags-cxx"] , "compiler-cc": ["CC", "compiler-cc"] @@ -194,22 +193,18 @@ , { "type": "join" , "separator": ":" , "$1": - { "type": "let*" - , "bindings": - [ [ "list" - , { "type": "++" - , "$1": - [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} - , {"type": "CALL_EXPRESSION", "name": "default-PATH"} - , { "type": "let*" - , "bindings": [["fieldname", "shell defaults"]] - , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"} - } - ] + { "type": "nub_left" + , "$1": + { "type": "++" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} + , {"type": "CALL_EXPRESSION", "name": "default-PATH"} + , { "type": "let*" + , "bindings": [["fieldname", "shell defaults"]] + , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"} } ] - ] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + } } } ] |