From 8637ececfd15c7325cf99a965a54387c7d994ad8 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Thu, 2 Jul 2015 01:01:53 -0700 Subject: Use a protoc compiled from sources --- grpc.bzl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'grpc.bzl') diff --git a/grpc.bzl b/grpc.bzl index 0e94c4faf8..5b5735e1bc 100644 --- a/grpc.bzl +++ b/grpc.bzl @@ -16,7 +16,7 @@ def _file_with_extension(src, ext): return "".join(elements[:-1] + [basename, ext]) def _protoc_invocation(srcs, flags): - protoc_command = "protoc -I . " + protoc_command = "$(location //external:protoc) -I . " srcs_params = "" for src in srcs: srcs_params += " $(location %s)" % (src) @@ -34,7 +34,7 @@ def objc_proto_library(name, srcs, visibility=None): native.genrule( name = name + "_codegen", - srcs = srcs, + srcs = srcs + ["//external:protoc"], outs = h_files + m_files, cmd = _protoc_invocation(srcs, protoc_flags), ) @@ -61,7 +61,10 @@ def objc_grpc_library(name, services, other_messages, visibility=None): native.genrule( name = name + "_codegen", - srcs = services + ["//external:grpc_protoc_plugin_objc"], + srcs = services + [ + "//external:grpc_protoc_plugin_objc", + "//external:protoc", + ], outs = h_files + m_files, cmd = _protoc_invocation(services, protoc_flags), ) -- cgit v1.2.3