diff options
| author | Florian Weikert <fwe@google.com> | 2016-10-12 14:03:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 14:03:07 +0200 |
| commit | c2b3e70efd2038a54ef8973771ac58192885125e (patch) | |
| tree | 5c2cef352815486c955fdbdc431154adb6f01a03 /protobuf.bzl | |
| parent | fd046f6263fb17383cafdbb25c361e3451c31105 (diff) | |
| download | protobuf-c2b3e70efd2038a54ef8973771ac58192885125e.tar.gz protobuf-c2b3e70efd2038a54ef8973771ac58192885125e.tar.bz2 protobuf-c2b3e70efd2038a54ef8973771ac58192885125e.zip | |
Declare all inputs of protoc action
ctx.executable.plugin must be in the inputs of protoc's action when using a plugin, otherwise the action will fail.
This bug has been hidden by a bug in Bazel: for every ctx.action, Bazel used to automatically add the runfiles of all executable inputs of the RULE instead of using the inputs of the specific ACTION. Consequently, we could get away with underspecifying the inputs of the action.
Diffstat (limited to 'protobuf.bzl')
| -rw-r--r-- | protobuf.bzl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/protobuf.bzl b/protobuf.bzl index e356f53c..e56a5365 100644 --- a/protobuf.bzl +++ b/protobuf.bzl @@ -62,6 +62,7 @@ def _proto_gen_impl(ctx): if ctx.attr.gen_py: args += ["--python_out=" + ctx.var["GENDIR"] + "/" + gen_dir] + inputs = srcs + deps if ctx.executable.plugin: plugin = ctx.executable.plugin lang = ctx.attr.plugin_language @@ -75,10 +76,11 @@ def _proto_gen_impl(ctx): outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)] args += ["--%s_out=%s" % (lang, outdir)] + inputs += [plugin] if args: ctx.action( - inputs=srcs + deps, + inputs=inputs, outputs=ctx.outputs.outs, arguments=args + import_flags + [s.path for s in srcs], executable=ctx.executable.protoc, |