summaryrefslogtreecommitdiff
path: root/patch
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-07-01 14:54:17 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-07-01 17:20:56 +0200
commit23e2b86ab2acb99b7625fa77c8fe9f81a1ec6099 (patch)
tree52031e55924de7a18273ad171fae17685066cb5f /patch
parent92bdfc81114d683a1012c106f224136b0a135dc9 (diff)
downloadrules-cc-23e2b86ab2acb99b7625fa77c8fe9f81a1ec6099.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 'patch')
-rw-r--r--patch/RULES22
1 files changed, 22 insertions, 0 deletions
diff --git a/patch/RULES b/patch/RULES
index e7d50f9..c55de58 100644
--- a/patch/RULES
+++ b/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"}]