diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-08-07 10:16:00 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-08-07 10:47:29 +0200 |
| commit | 5f0b15ec07111b3767c89b19d69a98a759b582f2 (patch) | |
| tree | 42e7860824a061509270bdc37d2b76633861ff2e /CC/EXPRESSIONS | |
| parent | d1a594af5bfb190fe625c400e700cc6096f7787b (diff) | |
| download | rules-cc-5f0b15ec07111b3767c89b19d69a98a759b582f2.tar.gz | |
Add field to ["CC", "defaults"] to specify arguments for ar
... instead of hard-coding ["cqs"].
Diffstat (limited to 'CC/EXPRESSIONS')
| -rw-r--r-- | CC/EXPRESSIONS | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS index ab7c922..39f8743 100644 --- a/CC/EXPRESSIONS +++ b/CC/EXPRESSIONS @@ -61,6 +61,27 @@ , "body": {"type": "var", "name": "AR"} } } +, "default-ARFLAGS": + { "vars": ["defaults-transition"] + , "imports": {"list_provider": ["./", "..", "field_list_provider"]} + , "expression": + { "type": "let*" + , "bindings": + [ ["fieldname", "defaults"] + , ["provider", "ARFLAGS"] + , ["transition", {"type": "var", "name": "defaults-transition"}] + , ["ARFLAGS", {"type": "CALL_EXPRESSION", "name": "list_provider"}] + , [ "ARFLAGS" + , { "type": "if" + , "cond": {"type": "var", "name": "ARFLAGS"} + , "then": {"type": "var", "name": "ARFLAGS"} + , "else": ["cqs"] + } + ] + ] + , "body": {"type": "var", "name": "ARFLAGS"} + } + } , "default-CFLAGS": { "vars": ["defaults-transition"] , "imports": {"list_provider": ["./", "..", "field_list_provider"]} @@ -922,6 +943,7 @@ , "flags": "flags" , "objects": "objects" , "default-AR": "default-AR" + , "default-ARFLAGS": "default-ARFLAGS" , "default-ENV": "default-ENV" , "default-PATH": "default-PATH" , "default-TOOLCHAIN": "default-TOOLCHAIN" @@ -973,6 +995,7 @@ } } ] + , ["ARFLAGS", {"type": "CALL_EXPRESSION", "name": "default-ARFLAGS"}] , [ "ENV" , { "type": "map_union" , "$1": @@ -1078,10 +1101,9 @@ , "cmd": { "type": "++" , "$1": - [ [ {"type": "var", "name": "AR", "default": "ar"} - , "cqs" - , {"type": "var", "name": "staged libpath"} - ] + [ [{"type": "var", "name": "AR", "default": "ar"}] + , {"type": "var", "name": "ARFLAGS"} + , [{"type": "var", "name": "staged libpath"}] , { "type": "keys" , "$1": {"type": "var", "name": "staged objects"} } |