diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-02-14 15:40:56 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-30 15:33:18 +0200 |
| commit | 52f36d3c99c0327ccba50dede36645432af798df (patch) | |
| tree | 7bfbfca02704e459ef4cf28954ec5d79fdc28d0a /CC/foreign/cmake/EXPRESSIONS | |
| parent | b09fa46239f251d5499dea26b313e4f9ef9b1aac (diff) | |
| download | rules-cc-52f36d3c99c0327ccba50dede36645432af798df.tar.gz | |
rules-cc: Use field_map_provider for default-ENV
Diffstat (limited to 'CC/foreign/cmake/EXPRESSIONS')
| -rw-r--r-- | CC/foreign/cmake/EXPRESSIONS | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS index 8977d5a..e1f019b 100644 --- a/CC/foreign/cmake/EXPRESSIONS +++ b/CC/foreign/cmake/EXPRESSIONS @@ -84,20 +84,12 @@ , [ "ENV" , { "type": "map_union" , "$1": - { "type": "++" - , "$1": - [ {"type": "CALL_EXPRESSION", "name": "default-ENV"} - , [ { "type": "var" - , "name": "ENV" - , "default": {"type": "empty_map"} - } - ] - , [ { "type": "env" - , "vars": ["CC", "CXX", "CXXFLAGS", "CFLAGS", "LDFLAGS"] - } - ] - ] - } + [ {"type": "CALL_EXPRESSION", "name": "default-ENV"} + , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}} + , { "type": "env" + , "vars": ["CC", "CXX", "CXXFLAGS", "CFLAGS", "LDFLAGS"] + } + ] } ] , [ "AR" |