diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-05-07 14:38:08 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2019-05-07 14:38:08 -0700 |
| commit | 6c1b78f09553ca14b20fcab070b1f730260838ed (patch) | |
| tree | 261dd3d5666f1d5cf08f5ea5881a59b1bec1f9b5 | |
| parent | 20d849a5e03945a5c764f3ffa98a6525378274e9 (diff) | |
Update Skylib and update to newer Sandwich API.
| -rw-r--r-- | WORKSPACE | 7 | ||||
| -rw-r--r-- | build_defs.bzl | 10 |
2 files changed, 8 insertions, 9 deletions
@@ -45,8 +45,7 @@ http_archive( ) http_archive( - name = "bazel_skylib", - sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d", - strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b", - urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"], + name = "bazel_skylib", + strip_prefix = "bazel-skylib-master", + urls = ["https://github.com/bazelbuild/bazel-skylib/archive/master.tar.gz"], ) diff --git a/build_defs.bzl b/build_defs.bzl index f24cff5..3e69680 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -285,7 +285,7 @@ def cc_library_func(ctx, hdrs, srcs, deps): requested_features = ctx.features, unsupported_features = ctx.disabled_features, ) - compilation_info = cc_common.compile( + (compilation_context, compilation_outputs) = cc_common.compile( actions = ctx.actions, feature_configuration = feature_configuration, cc_toolchain = toolchain, @@ -294,18 +294,18 @@ def cc_library_func(ctx, hdrs, srcs, deps): public_hdrs = hdrs, compilation_contexts = compilation_contexts, ) - linking_info = cc_common.link( + (linking_context, linking_outputs) = cc_common.create_linking_context_from_compilation_outputs( actions = ctx.actions, name = "upb_lib", feature_configuration = feature_configuration, cc_toolchain = toolchain, - cc_compilation_outputs = compilation_info.cc_compilation_outputs, + compilation_outputs = compilation_outputs, linking_contexts = linking_contexts, ) return CcInfo( - compilation_context = compilation_info.compilation_context, - linking_context = linking_info.linking_context, + compilation_context = compilation_context, + linking_context = linking_context, ) def _compile_upb_protos(ctx, proto_info, proto_sources, ext): |