diff options
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" |