diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2019-02-17 14:58:20 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2019-02-17 14:58:20 -0800 |
| commit | 5575a228c9e529d3d7656d777f876ca7062f4535 (patch) | |
| tree | 1deb5055fd004859a28d42ebdf5b6236822c0b39 | |
| parent | c1706e0a7cad3c1d24b0f0d19bd3626906fa9bfd (diff) | |
| parent | b0292a9eb1ab199217a04f726a536fab57d65e74 (diff) | |
Merge branch 'master' into defcleanup
| -rw-r--r-- | BUILD | 23 | ||||
| -rw-r--r-- | build_defs.bzl | 1 | ||||
| -rw-r--r-- | kokoro/ubuntu/build.sh | 5 |
3 files changed, 18 insertions, 11 deletions
@@ -124,6 +124,7 @@ cc_library( ], hdrs = ["upbc/generator.h"], deps = [ + map_dep("@absl//absl/base:core_headers"), map_dep("@absl//absl/strings"), map_dep("@com_google_protobuf//:protobuf"), map_dep("@com_google_protobuf//:protoc_lib"), @@ -416,6 +417,17 @@ py_binary( srcs = ["tools/make_cmakelists.py"], ) +genrule( + name = "gen_cmakelists", + srcs = [ + "BUILD", + "WORKSPACE", + ], + outs = ["generated/CMakeLists.txt"], + cmd = "$(location :make_cmakelists) $@", + tools = [":make_cmakelists"], +) + proto_library( name = "descriptor_proto", srcs = [ @@ -430,17 +442,6 @@ genrule( cmd = "cp $< $@", ) -genrule( - name = "gen_cmakelists", - srcs = [ - "BUILD", - "WORKSPACE", - ], - outs = ["generated/CMakeLists.txt"], - cmd = "$(location :make_cmakelists) $@", - tools = [":make_cmakelists"], -) - proto_library( name = "google_descriptor_proto", srcs = [ diff --git a/build_defs.bzl b/build_defs.bzl index 1c26a00..fe52d9b 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -210,6 +210,7 @@ upb_amalgamation = rule( is_bazel = not hasattr(native, "genmpm") google3_dep_map = { + "@absl//absl/base:core_headers": "//third_party/absl/base:core_headers", "@absl//absl/strings": "//third_party/absl/strings", "@com_google_protobuf//:protoc": "//third_party/protobuf:protoc", "@com_google_protobuf//:protobuf": "//third_party/protobuf:protobuf", diff --git a/kokoro/ubuntu/build.sh b/kokoro/ubuntu/build.sh index 3550a34..ad8122b 100644 --- a/kokoro/ubuntu/build.sh +++ b/kokoro/ubuntu/build.sh @@ -3,6 +3,11 @@ # Install the latest version of Bazel. use_bazel.sh latest +# Verify/query CMake +echo PATH=$PATH +ls -l `which cmake` +cmake --version + # Log the bazel path and version. which bazel bazel version |