diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-12-22 16:35:37 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2018-12-22 16:35:37 -0800 |
| commit | 810c45a224cb94074e80719f635b080d5b5914c6 (patch) | |
| tree | 0a34da4bdf74a1351f310a35aa75039664f8f89b | |
| parent | 4267380b67e93165fca8f5b9b626a2f2e1bcefa3 (diff) | |
| parent | 87b59f445b7be42685491b816416a4e360e30b33 (diff) | |
Merge branch 'master' into defcleanup
| -rw-r--r-- | build_defs.bzl | 9 | ||||
| -rw-r--r-- | kokoro/ubuntu/build.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/build_defs.bzl b/build_defs.bzl index 717a0e7..da21e86 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", diff --git a/kokoro/ubuntu/build.sh b/kokoro/ubuntu/build.sh index 70a8159..3550a34 100644 --- a/kokoro/ubuntu/build.sh +++ b/kokoro/ubuntu/build.sh @@ -8,4 +8,4 @@ which bazel bazel version cd $(dirname $0)/../.. -bazel test :all +bazel test --test_output=errors :all |