summaryrefslogtreecommitdiff
path: root/rules/CC/foreign/make/EXPRESSIONS
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-08-30 19:05:18 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2023-08-30 19:05:18 +0200
commitabd0e85b113293b8d7c11c9a2697d77d5fbbac93 (patch)
tree850b6f974bb5b6c9961f23d9f7bb2fe34759db7e /rules/CC/foreign/make/EXPRESSIONS
parentd501d86b5e974523e965d52001a5c185ce47be92 (diff)
parent4118e0b9930d11f6062751db4f1656e8cc2a680a (diff)
downloadrules-cc-abd0e85b113293b8d7c11c9a2697d77d5fbbac93.tar.gz
Merge subtree 'rules' into rules-cc
Diffstat (limited to 'rules/CC/foreign/make/EXPRESSIONS')
-rw-r--r--rules/CC/foreign/make/EXPRESSIONS15
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"