Skip to content
Snippets Groups Projects
Commit 8637ecec authored by Jorge Canizales's avatar Jorge Canizales
Browse files

Use a protoc compiled from sources

parent 907fad9c
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ def _file_with_extension(src, ext): ...@@ -16,7 +16,7 @@ def _file_with_extension(src, ext):
return "".join(elements[:-1] + [basename, ext]) return "".join(elements[:-1] + [basename, ext])
def _protoc_invocation(srcs, flags): def _protoc_invocation(srcs, flags):
protoc_command = "protoc -I . " protoc_command = "$(location //external:protoc) -I . "
srcs_params = "" srcs_params = ""
for src in srcs: for src in srcs:
srcs_params += " $(location %s)" % (src) srcs_params += " $(location %s)" % (src)
...@@ -34,7 +34,7 @@ def objc_proto_library(name, srcs, visibility=None): ...@@ -34,7 +34,7 @@ def objc_proto_library(name, srcs, visibility=None):
native.genrule( native.genrule(
name = name + "_codegen", name = name + "_codegen",
srcs = srcs, srcs = srcs + ["//external:protoc"],
outs = h_files + m_files, outs = h_files + m_files,
cmd = _protoc_invocation(srcs, protoc_flags), cmd = _protoc_invocation(srcs, protoc_flags),
) )
...@@ -61,7 +61,10 @@ def objc_grpc_library(name, services, other_messages, visibility=None): ...@@ -61,7 +61,10 @@ def objc_grpc_library(name, services, other_messages, visibility=None):
native.genrule( native.genrule(
name = name + "_codegen", name = name + "_codegen",
srcs = services + ["//external:grpc_protoc_plugin_objc"], srcs = services + [
"//external:grpc_protoc_plugin_objc",
"//external:protoc",
],
outs = h_files + m_files, outs = h_files + m_files,
cmd = _protoc_invocation(services, protoc_flags), cmd = _protoc_invocation(services, protoc_flags),
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment