diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-04-04 18:29:06 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-04-18 12:44:10 +0200 |
| commit | aaa3bff3e4c6373028d8dc1a0b170d3bd7690e24 (patch) | |
| tree | 88b56903a960c45de034140f8b3ccca6acb72498 | |
| parent | 78ffc7f9d2a22f53971e63c489da3c28ade1937f (diff) | |
| download | justbuild-aaa3bff3e4c6373028d8dc1a0b170d3bd7690e24.tar.gz | |
rules: Update dependency on protobuf and grpc targets
| -rw-r--r-- | rules/CC/proto/EXPRESSIONS | 8 | ||||
| -rw-r--r-- | rules/CC/proto/RULES | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/rules/CC/proto/EXPRESSIONS b/rules/CC/proto/EXPRESSIONS index 1ab17a59..3341637b 100644 --- a/rules/CC/proto/EXPRESSIONS +++ b/rules/CC/proto/EXPRESSIONS @@ -23,7 +23,7 @@ , "imports": { "stage": ["", "stage_singleton_field"] , "result": ["./", "..", "lib result"] - , "artifacts": ["./", "../..", "field_artifacts"] + , "runfiles": ["./", "../..", "field_runfiles"] , "artifacts_list": ["./", "../..", "field_artifacts_list"] , "protoc-deps": "protoc-deps" } @@ -62,8 +62,8 @@ , "subdir": "work" , "$1": { "type": "let*" - , "bindings": [["fieldname", "well_known_protos"]] - , "body": {"type": "CALL_EXPRESSION", "name": "artifacts"} + , "bindings": [["fieldname", "proto-deps"]] + , "body": {"type": "CALL_EXPRESSION", "name": "runfiles"} } } ] @@ -299,7 +299,7 @@ } ] , ["cflags", []] - , ["private-cflags", ["-Wno-sign-conversion", "-Wno-unused-function"]] + , ["private-cflags", []] , ["private-ldflags", []] ] , "body": {"type": "CALL_EXPRESSION", "name": "result"} diff --git a/rules/CC/proto/RULES b/rules/CC/proto/RULES index 39d342f2..89d1e344 100644 --- a/rules/CC/proto/RULES +++ b/rules/CC/proto/RULES @@ -12,8 +12,7 @@ , "implicit": { "protoc": [["@", "protoc", "", "protoc"]] , "defaults": [["./", "..", "defaults"]] - , "proto-deps": [["@", "protoc", "", "C++ runtime"]] - , "well_known_protos": [["@", "protoc", "", "well_known_protos"]] + , "proto-deps": [["@", "protoc", "", "libprotobuf"]] } , "imports": { "protoc-compile": "protoc-compile" @@ -53,14 +52,10 @@ ["OS", "ARCH", "HOST_ARCH", "CXX", "CXXFLAGS", "ADD_CXXFLAGS", "AR", "ENV"] , "implicit": { "protoc": [["@", "protoc", "", "protoc"]] - , "grpc_cpp_plugin": [["@", "grpc", "src/compiler", "grpc_cpp_plugin"]] + , "grpc_cpp_plugin": [["@", "grpc", "", "grpc_cpp_plugin"]] , "defaults": [["./", "..", "defaults"]] , "proto-deps": - [ ["@", "grpc", "", "grpc++_codegen_proto"] - , ["@", "grpc", "", "grpc++_codegen_base_src"] - , ["@", "protoc", "", "C++ runtime"] - ] - , "well_known_protos": [["@", "protoc", "", "well_known_protos"]] + [["@", "grpc", "", "grpc++"], ["@", "protoc", "", "libprotobuf"]] } , "imports": { "protoc-compile": "protoc-compile" |