diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-09-19 14:13:02 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-10-10 17:28:26 +0200 |
| commit | 6f404766c89fb48c4fc871d2ccb273bc5d5b2e5e (patch) | |
| tree | 4a020048a1be9198811079ac56f43230a56576ad /CC | |
| parent | 1b8e5c3362673ece4bffe49e0f613eb3b5ec0aeb (diff) | |
| download | rules-cc-6f404766c89fb48c4fc871d2ccb273bc5d5b2e5e.tar.gz | |
rules: Use new 'env' expression
Diffstat (limited to 'CC')
| -rw-r--r-- | CC/EXPRESSIONS | 13 | ||||
| -rw-r--r-- | CC/RULES | 29 |
2 files changed, 3 insertions, 39 deletions
diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS index 48f40a2..5153b2d 100644 --- a/CC/EXPRESSIONS +++ b/CC/EXPRESSIONS @@ -506,18 +506,7 @@ , "provides": { "type": "map_union" , "$1": - [ { "type": "singleton_map" - , "key": "compile-deps" - , "value": {"type": "var", "name": "compile-deps"} - } - , { "type": "singleton_map" - , "key": "link-deps" - , "value": {"type": "var", "name": "link-deps"} - } - , { "type": "singleton_map" - , "key": "link-args" - , "value": {"type": "var", "name": "link-args"} - } + [ {"type": "env", "vars": ["compile-deps", "link-deps", "link-args"]} , { "type": "var" , "name": "extra-provides" , "default": {"type": "empty_map"} @@ -103,33 +103,8 @@ , "body": { "type": "RESULT" , "provides": - { "type": "map_union" - , "$1": - [ { "type": "singleton_map" - , "key": "CC" - , "value": {"type": "var", "name": "CC"} - } - , { "type": "singleton_map" - , "key": "CXX" - , "value": {"type": "var", "name": "CXX"} - } - , { "type": "singleton_map" - , "key": "CFLAGS" - , "value": {"type": "var", "name": "CFLAGS"} - } - , { "type": "singleton_map" - , "key": "CXXFLAGS" - , "value": {"type": "var", "name": "CXXFLAGS"} - } - , { "type": "singleton_map" - , "key": "AR" - , "value": {"type": "var", "name": "AR"} - } - , { "type": "singleton_map" - , "key": "ENV" - , "value": {"type": "var", "name": "ENV"} - } - ] + { "type": "env" + , "vars": ["CC", "CXX", "CFLAGS", "CXXFLAGS", "AR", "ENV"] } } } |