Fixed amalgamation to not list header files explicitly.

6 years ago · b4dec6b897
parent 161258a2ad
commit b4dec6b897
1 changed files with 5 additions and 4 deletions
--- a/build_defs.bzl
+++ b/build_defs.bzl
@ -182,13 +182,14 @@ _file_list_aspect = aspect(
 )

 def _upb_amalgamation(ctx):
+    inputs = []
    srcs = []
-    hdrs = []
    for lib in ctx.attr.libs:
-        srcs += lib[SrcList].srcs
-        hdrs += lib[SrcList].hdrs
+        inputs += lib[SrcList].srcs
+        inputs += lib[SrcList].hdrs
+        srcs += [src for src in lib[SrcList].srcs if src.path.endswith("c")]
    ctx.actions.run(
-        inputs = srcs + hdrs,
+        inputs = inputs,
        outputs = ctx.outputs.outs,
        arguments = ["", ctx.bin_dir.path + "/"] + [f.path for f in srcs],
        progress_message = "Making amalgamation",