diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-07-01 12:41:05 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-07-01 17:20:56 +0200 |
| commit | 69aa0471cc9fd5b288e204bf36c253ec4638b307 (patch) | |
| tree | 64b2580611f67639d536a7f8eb3d5d51476e8aab | |
| parent | 3dd8dde50bfa107a00b7718d9e49347501ef477e (diff) | |
| download | justbuild-69aa0471cc9fd5b288e204bf36c253ec4638b307.tar.gz | |
["CC/auto", "config"]: honor bin dirs of shell defaults
| -rw-r--r-- | rules/CC/auto/RULES | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/rules/CC/auto/RULES b/rules/CC/auto/RULES index 65aca1c1..debae9c1 100644 --- a/rules/CC/auto/RULES +++ b/rules/CC/auto/RULES @@ -162,6 +162,7 @@ , "default-TOOLCHAIN": ["./", "..", "default-TOOLCHAIN"] , "default-NON_SYSTEM_TOOLS": ["./", "..", "default-NON_SYSTEM_TOOLS"] , "map_provider": ["./", "../..", "field_map_provider"] + , "list_provider": ["./", "../..", "field_list_provider"] , "sh": ["./", "../../shell", "sh"] , "sh-PATH": ["./", "../../shell", "PATH"] } @@ -241,6 +242,27 @@ , "body": {"type": "CALL_EXPRESSION", "name": "sh"} } ] + , [ "bin dirs" + , { "type": "let*" + , "bindings": + [["fieldname", "shell defaults"], ["provider", "bin dirs"]] + , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"} + } + ] + , [ "bin dirs" + , { "type": "foreach" + , "range": {"type": "var", "name": "bin dirs"} + , "body": + { "type": "join" + , "$1": + [ "./" + , {"type": "var", "name": "TOOLCHAIN_DIR"} + , "/" + , {"type": "var", "name": "_"} + ] + } + } + ] , [ "NON_SYSTEM_TOOLS" , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"} ] @@ -283,6 +305,7 @@ , "bindings": [["fieldname", "shell defaults"]] , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"} } + , {"type": "var", "name": "bin dirs"} ] } } |