diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-11-06 10:50:12 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-11-06 14:37:16 +0100 |
| commit | 5803ce704eb9cf9c30235e82856ed738486256e1 (patch) | |
| tree | 458f50d00903264aacec508d17ccb100b5e2e812 /CC/foreign/shell | |
| parent | b6d8aaa44ad3e508ee71613e0bb5a6d1b33f441a (diff) | |
| download | rules-cc-5803ce704eb9cf9c30235e82856ed738486256e1.tar.gz | |
Prefer built-in "nub_left"
Now that justbuild 1.4 is available, the workaround of defining
"nub_left" in terms of "reverse" and "nub_right" is no longer
necessary.
Diffstat (limited to 'CC/foreign/shell')
| -rw-r--r-- | CC/foreign/shell/EXPRESSIONS | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/CC/foreign/shell/EXPRESSIONS b/CC/foreign/shell/EXPRESSIONS index a1dcd0c..a37d315 100644 --- a/CC/foreign/shell/EXPRESSIONS +++ b/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"} + } } } ] |