diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2024-06-10 10:22:52 +0200 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2024-06-10 10:22:52 +0200 |
commit | d22a155812d4f24d6c6b1b3126635e41324e552a (patch) | |
tree | b4c5962f425d69ffd59d33e04ec11bd0cc33247f /CC/proto/EXPRESSIONS | |
parent | baa40533450c53d393580ad5189bee73cf98cd50 (diff) | |
parent | 153f2ef5035d82df02e2e748114279d54ac863ff (diff) | |
download | rules-cc-d22a155812d4f24d6c6b1b3126635e41324e552a.tar.gz |
Merge branch 'just-rules' into rules
Diffstat (limited to 'CC/proto/EXPRESSIONS')
-rw-r--r-- | CC/proto/EXPRESSIONS | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/CC/proto/EXPRESSIONS b/CC/proto/EXPRESSIONS index 29c205c..2286d06 100644 --- a/CC/proto/EXPRESSIONS +++ b/CC/proto/EXPRESSIONS @@ -11,6 +11,19 @@ , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"} } } +, "default-PROTOCFLAGS": + { "vars": ["defaults-transition"] + , "imports": {"list_provider": ["./", "../..", "field_list_provider"]} + , "expression": + { "type": "let*" + , "bindings": + [ ["fieldname", "proto-defaults"] + , ["provider", "PROTOCFLAGS"] + , ["transition", {"type": "var", "name": "defaults-transition"}] + ] + , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"} + } + } , "default-LDFLAGS": { "vars": ["defaults-transition"] , "imports": {"list_provider": ["./", "../..", "field_list_provider"]} @@ -128,6 +141,7 @@ , "artifacts_list": ["./", "../..", "field_artifacts_list"] , "protoc-deps": "protoc-deps" , "default-PROTOC": "default-PROTOC" + , "default-PROTOCFLAGS": "default-PROTOCFLAGS" , "default-LDFLAGS": "default-LDFLAGS" , "default-GRPC_PLUGIN": "default-GRPC_PLUGIN" , "default-ENV": "default-ENV" @@ -297,10 +311,9 @@ , [ "cmd" , { "type": "++" , "$1": - [ [ {"type": "var", "name": "PROTOC"} - , "--proto_path=work" - , "--cpp_out=work" - ] + [ [{"type": "var", "name": "PROTOC"}] + , {"type": "CALL_EXPRESSION", "name": "default-PROTOCFLAGS"} + , ["--proto_path=work", "--cpp_out=work"] , { "type": "if" , "cond": {"type": "var", "name": "service support"} , "then": |