summaryrefslogtreecommitdiff
path: root/rules/CC/prebuilt
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/prebuilt
parent2d7051782625966857286aace6ff18760114ecc7 (diff)
parent9f535dadf06c6c6554bac632069777cf1b63ebf5 (diff)
downloadrules-cc-14300d3768522b1a201c30c94b6e54e096520b20.tar.gz
Merge commit '9f535dadf06c6c6554bac632069777cf1b63ebf5' into rules/rules-cc
Diffstat (limited to 'rules/CC/prebuilt')
-rw-r--r--rules/CC/prebuilt/EXPRESSIONS13
1 files changed, 3 insertions, 10 deletions
diff --git a/rules/CC/prebuilt/EXPRESSIONS b/rules/CC/prebuilt/EXPRESSIONS
index 6b7169a..c404bec 100644
--- a/rules/CC/prebuilt/EXPRESSIONS
+++ b/rules/CC/prebuilt/EXPRESSIONS
@@ -234,16 +234,9 @@
, [ "ENV"
, { "type": "map_union"
, "$1":
- { "type": "++"
- , "$1":
- [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
- , [ { "type": "var"
- , "name": "ENV"
- , "default": {"type": "empty_map"}
- }
- ]
- ]
- }
+ [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+ , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+ ]
}
]
, [ "main-pkg-config"