浏览代码

Fix depset/list confusion for ctx.attr.deps.

Signed-off-by: Harvey Tuch <htuch@google.com>
Harvey Tuch 5 年之前
父节点
当前提交
9482bfd22b
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      protobuf.bzl

+ 2 - 2
protobuf.bzl

@@ -85,8 +85,8 @@ def _proto_gen_impl(ctx):
         import_flags = depset(direct=["-I."])
         import_flags = depset(direct=["-I."])
 
 
     for dep in ctx.attr.deps:
     for dep in ctx.attr.deps:
-        import_flags = depset(transitive=[import_flags, dep.proto.import_flags])
-        deps = depset(transitive=[deps, dep.proto.deps])
+        import_flags = depset(transitive=[import_flags, depset(direct=dep.proto.import_flags)])
+        deps = depset(transitive=[deps, depset(direct=dep.proto.deps)])
 
 
     if not ctx.attr.gen_cc and not ctx.attr.gen_py and not ctx.executable.plugin:
     if not ctx.attr.gen_cc and not ctx.attr.gen_py and not ctx.executable.plugin:
         return struct(
         return struct(