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/shell/EXPRESSIONS | |
| parent | d501d86b5e974523e965d52001a5c185ce47be92 (diff) | |
| parent | 4118e0b9930d11f6062751db4f1656e8cc2a680a (diff) | |
| download | rules-cc-abd0e85b113293b8d7c11c9a2697d77d5fbbac93.tar.gz | |
Merge subtree 'rules' into rules-cc
Diffstat (limited to 'rules/CC/foreign/shell/EXPRESSIONS')
| -rw-r--r-- | rules/CC/foreign/shell/EXPRESSIONS | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/rules/CC/foreign/shell/EXPRESSIONS b/rules/CC/foreign/shell/EXPRESSIONS index d5f9527..2f05497 100644 --- a/rules/CC/foreign/shell/EXPRESSIONS +++ b/rules/CC/foreign/shell/EXPRESSIONS @@ -18,6 +18,7 @@ , "PREFIX" , "BUILD_POSITION_INDEPENDENT" , "TIMEOUT_SCALE" + , "expand_exec" ] , "imports": { "artifacts": ["", "field_artifacts"] @@ -31,7 +32,6 @@ , "default-PATH": ["CC", "default-PATH"] , "default-TOOLCHAIN": ["CC", "default-TOOLCHAIN"] , "default-NON_SYSTEM_TOOLS": ["CC", "default-NON_SYSTEM_TOOLS"] - , "expand_exec_tool": ["./", "..", "expand_exec_tool"] , "foreign-MAKE": ["CC/foreign", "default-MAKE"] , "foreign-CMAKE": ["CC/foreign", "default-CMAKE"] , "foreign-PATH": ["CC/foreign", "default-PATH"] @@ -42,10 +42,7 @@ , "expression": { "type": "let*" , "bindings": - [ [ "expand_exec" - , {"type": "CALL_EXPRESSION", "name": "expand_exec_tool"} - ] - , ["TOOLCHAIN_DIR", "toolchain"] + [ ["TOOLCHAIN_DIR", "toolchain"] , [ "TOOLCHAIN" , { "type": "disjoint_map_union" , "msg": "Toolchain trees may not overlap" |