diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2018-12-22 15:11:08 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2018-12-22 15:11:08 -0800 |
commit | b4dec6b897dcce0116e6afb09ef17ca8b7fcb3d7 (patch) | |
tree | 7e6163216f3a8071bd0b0a9afa6379dd267745bc /build_defs.bzl | |
parent | 161258a2adeaffd4e2cd5ab4ea370224e618ec95 (diff) |
Fixed amalgamation to not list header files explicitly.
Diffstat (limited to 'build_defs.bzl')
-rw-r--r-- | build_defs.bzl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build_defs.bzl b/build_defs.bzl index 8251014..7445fce 100644 --- 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", |