diff options
Diffstat (limited to 'rules/CC/foreign/make/EXPRESSIONS')
| -rw-r--r-- | rules/CC/foreign/make/EXPRESSIONS | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/rules/CC/foreign/make/EXPRESSIONS b/rules/CC/foreign/make/EXPRESSIONS index aeafbfc..ceb5913 100644 --- a/rules/CC/foreign/make/EXPRESSIONS +++ b/rules/CC/foreign/make/EXPRESSIONS @@ -25,7 +25,7 @@ , "BUILD_POSITION_INDEPENDENT" , "TIMEOUT_SCALE" , "defaults-transition" - , "host-defaults-transition" + , "expand_exec" ] , "imports": { "artifacts": ["", "field_artifacts"] @@ -40,7 +40,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-ENV": ["CC/foreign", "default-ENV"] , "foreign-PATH": ["CC/foreign", "default-PATH"] @@ -50,17 +49,7 @@ , "expression": { "type": "let*" , "bindings": - [ [ "expand_exec" - , { "type": "let*" - , "bindings": - [ [ "defaults-transition" - , {"type": "var", "name": "host-defaults-transition"} - ] - ] - , "body": {"type": "CALL_EXPRESSION", "name": "expand_exec_tool"} - } - ] - , ["TOOLCHAIN_DIR", "toolchain"] + [ ["TOOLCHAIN_DIR", "toolchain"] , [ "TOOLCHAIN" , { "type": "disjoint_map_union" , "msg": "Toolchain trees may not overlap" |