diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-30 19:05:18 +0200 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-30 19:05:18 +0200 |
commit | abd0e85b113293b8d7c11c9a2697d77d5fbbac93 (patch) | |
tree | 850b6f974bb5b6c9961f23d9f7bb2fe34759db7e /rules/CC/foreign/make/RULES | |
parent | d501d86b5e974523e965d52001a5c185ce47be92 (diff) | |
parent | 4118e0b9930d11f6062751db4f1656e8cc2a680a (diff) | |
download | rules-cc-abd0e85b113293b8d7c11c9a2697d77d5fbbac93.tar.gz |
Merge subtree 'rules' into rules-cc
Diffstat (limited to 'rules/CC/foreign/make/RULES')
-rw-r--r-- | rules/CC/foreign/make/RULES | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/rules/CC/foreign/make/RULES b/rules/CC/foreign/make/RULES index 08e5414..76fca18 100644 --- a/rules/CC/foreign/make/RULES +++ b/rules/CC/foreign/make/RULES @@ -41,6 +41,7 @@ , "implicit": { "defaults": [["CC", "defaults"]] , "foreign-defaults": [["CC/foreign", "defaults"]] + , "expand_exec": [["./", "..", "expand_exec"]] } , "field_doc": { "project": @@ -172,6 +173,7 @@ , "config_transitions": { "defaults": [{"type": "empty_map"}, {"type": "CALL_EXPRESSION", "name": "for host"}] + , "expand_exec": [{"type": "CALL_EXPRESSION", "name": "for host"}] } , "expression": { "type": "let*" @@ -221,8 +223,15 @@ , ["pre_cmds", {"type": "FIELD", "name": "pre_cmds"}] , ["post_cmds", {"type": "FIELD", "name": "post_cmds"}] , ["defaults-transition", {"type": "empty_map"}] - , [ "host-defaults-transition" - , {"type": "CALL_EXPRESSION", "name": "for host"} + , [ "expand_exec" + , { "type": "let*" + , "bindings": + [ ["fieldname", "expand_exec"] + , ["location", "expand_exec"] + , ["transition", {"type": "CALL_EXPRESSION", "name": "for host"}] + ] + , "body": {"type": "CALL_EXPRESSION", "name": "stage_field"} + } ] , ["full_install_dir", {"type": "CALL_EXPRESSION", "name": "make-build"}] , [ "install_dir" @@ -323,6 +332,7 @@ { "defaults": [["CC", "defaults"]] , "foreign-defaults": [["CC/foreign", "defaults"]] , "config_reader": [["CC", "prebuilt/read_pkgconfig.py"]] + , "expand_exec": [["./", "..", "expand_exec"]] } , "field_doc": { "project": @@ -492,6 +502,7 @@ , "config_transitions": { "defaults": [{"type": "empty_map"}, {"type": "CALL_EXPRESSION", "name": "for host"}] + , "expand_exec": [{"type": "CALL_EXPRESSION", "name": "for host"}] } , "expression": { "type": "let*" @@ -630,8 +641,15 @@ , ["pre_cmds", {"type": "FIELD", "name": "pre_cmds"}] , ["post_cmds", {"type": "FIELD", "name": "post_cmds"}] , ["defaults-transition", {"type": "empty_map"}] - , [ "host-defaults-transition" - , {"type": "CALL_EXPRESSION", "name": "for host"} + , [ "expand_exec" + , { "type": "let*" + , "bindings": + [ ["fieldname", "expand_exec"] + , ["location", "expand_exec"] + , ["transition", {"type": "CALL_EXPRESSION", "name": "for host"}] + ] + , "body": {"type": "CALL_EXPRESSION", "name": "stage_field"} + } ] , ["full_install_dir", {"type": "CALL_EXPRESSION", "name": "make-build"}] , [ "install_dir" |