diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2018-12-23 16:20:04 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2018-12-23 16:20:04 -0800 |
commit | 08987e3dd4159cf7d1d303a81fd38c5e02a44557 (patch) | |
tree | 8f8123f2a41c4cee2f39cd9fe7d4954bb4ed8183 /build_defs.bzl | |
parent | aa2d5a609bc714e90300f26e04e729a4822a2aa5 (diff) | |
parent | 87b59f445b7be42685491b816416a4e360e30b33 (diff) |
Merge branch 'master' into arrayapi
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", |