From 20d849a5e03945a5c764f3ffa98a6525378274e9 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 7 May 2019 11:30:28 -0700 Subject: Fixes for Bazel 0.25. Disabled the conformance tests for now because I didn't push the necessary changes to the protobuf repo yet. --- build_defs.bzl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'build_defs.bzl') diff --git a/build_defs.bzl b/build_defs.bzl index 9deb336..f24cff5 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -1,3 +1,7 @@ + +load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") + _shell_find_runfiles = """ # --- begin runfiles.bash initialization --- # Copy-pasted from Bazel's Bash runfiles library (tools/bash/runfiles/runfiles.bash). @@ -23,10 +27,6 @@ _shell_find_runfiles = """ # --- end runfiles.bash initialization --- """ -load("@bazel_skylib//lib:paths.bzl", "paths") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") -load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "CPP_LINK_STATIC_LIBRARY_ACTION_NAME") - def _librule(name): return name + "_lib" @@ -286,15 +286,17 @@ def cc_library_func(ctx, hdrs, srcs, deps): unsupported_features = ctx.disabled_features, ) compilation_info = cc_common.compile( - ctx = ctx, + actions = ctx.actions, feature_configuration = feature_configuration, cc_toolchain = toolchain, + name = "upb_lib", srcs = srcs, - hdrs = hdrs, + public_hdrs = hdrs, compilation_contexts = compilation_contexts, ) linking_info = cc_common.link( - ctx = ctx, + actions = ctx.actions, + name = "upb_lib", feature_configuration = feature_configuration, cc_toolchain = toolchain, cc_compilation_outputs = compilation_info.cc_compilation_outputs, -- cgit v1.2.3