From 23e2b86ab2acb99b7625fa77c8fe9f81a1ec6099 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Mon, 1 Jul 2024 14:54:17 +0200 Subject: ["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. --- patch/RULES | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) 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"}] -- cgit v1.2.3