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/pkgconfig/RULES | |
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/pkgconfig/RULES')
-rw-r--r-- | CC/pkgconfig/RULES | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/CC/pkgconfig/RULES b/CC/pkgconfig/RULES index 363136f..f72fdf6 100644 --- a/CC/pkgconfig/RULES +++ b/CC/pkgconfig/RULES @@ -14,7 +14,6 @@ , "imports": { "base-provides": ["./", "..", "defaults-base-provides"] , "base-provides-++": ["./", "..", "defaults-base-provides-++"] - , "nub_left": ["", "nub_left"] } , "expression": { "type": "let*" @@ -31,33 +30,27 @@ , ["PATH", {"type": "FIELD", "name": "PATH"}] , ["provider", "PATH"] , [ "PATH" - , { "type": "++" + , { "type": "nub_left" , "$1": - [ {"type": "var", "name": "PATH"} - , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} - ] - } - ] - , [ "PATH" - , { "type": "let*" - , "bindings": [["list", {"type": "var", "name": "PATH"}]] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + { "type": "++" + , "$1": + [ {"type": "var", "name": "PATH"} + , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} + ] + } } ] , ["PKG_CONFIG_PATH", {"type": "FIELD", "name": "PKG_CONFIG_PATH"}] , ["provider", "PKG_CONFIG_PATH"] , [ "PKG_CONFIG_PATH" - , { "type": "++" + , { "type": "nub_left" , "$1": - [ {"type": "var", "name": "PKG_CONFIG_PATH"} - , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} - ] - } - ] - , [ "PKG_CONFIG_PATH" - , { "type": "let*" - , "bindings": [["list", {"type": "var", "name": "PKG_CONFIG_PATH"}]] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + { "type": "++" + , "$1": + [ {"type": "var", "name": "PKG_CONFIG_PATH"} + , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} + ] + } } ] ] |