diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-07-01 14:54:17 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-07-01 17:20:56 +0200 |
| commit | 695418d71a84d2ba8dbbf9cd286b1c2a64afe46b (patch) | |
| tree | 65cd3ec25478d375dfa999c83c65a459f95cabd8 /rules/patch/RULES | |
| parent | 69aa0471cc9fd5b288e204bf36c253ec4638b307 (diff) | |
| download | justbuild-695418d71a84d2ba8dbbf9cd286b1c2a64afe46b.tar.gz | |
["patch", "file"]: honor shell bin dirs
... as we need to copy a file, as not all versions of patch accept the file to patch
as argument.
Diffstat (limited to 'rules/patch/RULES')
| -rw-r--r-- | rules/patch/RULES | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/rules/patch/RULES b/rules/patch/RULES index e7d50f95..c55de588 100644 --- a/rules/patch/RULES +++ b/rules/patch/RULES @@ -168,6 +168,7 @@ , "sh-TOOLCHAIN": ["CC", "default-TOOLCHAIN"] , "sh-PATH": ["CC", "default-PATH"] , "sh": ["shell", "sh"] + , "list_provider": ["./", "..", "field_list_provider"] } , "expression": { "type": "let*" @@ -188,6 +189,26 @@ , "$1": {"type": "var", "name": "TOOLCHAIN"} } ] + , [ "bin dirs" + , { "type": "let*" + , "bindings": [["fieldname", "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"} ] @@ -242,6 +263,7 @@ , "$1": [ {"type": "CALL_EXPRESSION", "name": "default-PATH"} , {"type": "CALL_EXPRESSION", "name": "sh-PATH"} + , {"type": "var", "name": "bin dirs"} , { "type": "if" , "cond": {"type": "var", "name": "ENV_PATH"} , "then": [{"type": "var", "name": "ENV_PATH"}] |