summaryrefslogtreecommitdiff
path: root/rules/CC/proto/EXPRESSIONS
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-05-30 15:38:40 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2023-05-30 15:38:40 +0200
commit14300d3768522b1a201c30c94b6e54e096520b20 (patch)
treeeaa057fd88ddba1a94c48585fcfcbb71628fcbe7 /rules/CC/proto/EXPRESSIONS
parent2d7051782625966857286aace6ff18760114ecc7 (diff)
parent9f535dadf06c6c6554bac632069777cf1b63ebf5 (diff)
downloadrules-cc-14300d3768522b1a201c30c94b6e54e096520b20.tar.gz
Merge commit '9f535dadf06c6c6554bac632069777cf1b63ebf5' into rules/rules-cc
Diffstat (limited to 'rules/CC/proto/EXPRESSIONS')
-rw-r--r--rules/CC/proto/EXPRESSIONS11
1 files changed, 3 insertions, 8 deletions
diff --git a/rules/CC/proto/EXPRESSIONS b/rules/CC/proto/EXPRESSIONS
index 894b80b..6be74df 100644
--- a/rules/CC/proto/EXPRESSIONS
+++ b/rules/CC/proto/EXPRESSIONS
@@ -138,14 +138,9 @@
, ["TOOLCHAIN_DIR", "toolchain"]
, ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}]
, [ "TOOLCHAIN"
- , { "type": "if"
- , "cond": {"type": "var", "name": "TOOLCHAIN"}
- , "then":
- { "type": "to_subdir"
- , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"}
- , "$1": {"type": "var", "name": "TOOLCHAIN"}
- }
- , "else": {"type": "empty_map"}
+ , { "type": "to_subdir"
+ , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"}
+ , "$1": {"type": "var", "name": "TOOLCHAIN"}
}
]
, [ "NON_SYSTEM_TOOLS"