diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-16 19:19:11 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-30 15:01:41 +0200 |
| commit | 7fb8a3ec48f49a019cd9656b891ab17cfa0a89f6 (patch) | |
| tree | 0b84352111a92f5ceb1a2a6aee31a99569013f58 | |
| parent | d86acfcf8c6d6650ff79c4d9e7354b06443a26d3 (diff) | |
| download | justbuild-7fb8a3ec48f49a019cd9656b891ab17cfa0a89f6.tar.gz | |
rules: Use field_map_provider for default-ENV
| -rw-r--r-- | rules/CC/EXPRESSIONS | 30 | ||||
| -rw-r--r-- | rules/CC/RULES | 1 | ||||
| -rw-r--r-- | rules/CC/auto/RULES | 13 | ||||
| -rw-r--r-- | rules/CC/pkgconfig/EXPRESSIONS | 13 |
4 files changed, 15 insertions, 42 deletions
diff --git a/rules/CC/EXPRESSIONS b/rules/CC/EXPRESSIONS index c3541cd6..fd90914f 100644 --- a/rules/CC/EXPRESSIONS +++ b/rules/CC/EXPRESSIONS @@ -84,7 +84,7 @@ } , "default-ENV": { "vars": ["defaults-transition"] - , "imports": {"provider_list": ["./", "..", "field_provider_list"]} + , "imports": {"map_provider": ["./", "..", "field_map_provider"]} , "expression": { "type": "let*" , "bindings": @@ -95,7 +95,7 @@ ] , ["default", {"type": "empty_map"}] ] - , "body": {"type": "CALL_EXPRESSION", "name": "provider_list"} + , "body": {"type": "CALL_EXPRESSION", "name": "map_provider"} } } , "defaults-base-provides": @@ -749,16 +749,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"}} + ] } ] , ["objects", {"type": "CALL_EXPRESSION", "name": "objects"}] @@ -982,16 +975,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"}} + ] } ] , ["hdrs", {"type": "empty_map"}] diff --git a/rules/CC/RULES b/rules/CC/RULES index ff642b92..63be910f 100644 --- a/rules/CC/RULES +++ b/rules/CC/RULES @@ -68,6 +68,7 @@ } ] , ["provider", "ENV"] + , ["default", {"type": "empty_map"}] , [ "ENV" , { "type": "if" , "cond": {"type": "var", "name": "PATH"} diff --git a/rules/CC/auto/RULES b/rules/CC/auto/RULES index e04289c7..fb75a64e 100644 --- a/rules/CC/auto/RULES +++ b/rules/CC/auto/RULES @@ -204,16 +204,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"}} + ] } ] , [ "c.flags" diff --git a/rules/CC/pkgconfig/EXPRESSIONS b/rules/CC/pkgconfig/EXPRESSIONS index c7704213..4c174c40 100644 --- a/rules/CC/pkgconfig/EXPRESSIONS +++ b/rules/CC/pkgconfig/EXPRESSIONS @@ -7,16 +7,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"}} + ] } ] , [ "cflags-filename" |