Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bazel/private/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ bzl_library(
"bazel_java_proto_library_rule.bzl",
"java_proto_support.bzl",
],
visibility = ["//bazel:__subpackages__"],
visibility = [
"//bazel:__subpackages__",
],
deps = [
":toolchain_helpers_bzl",
"//bazel/common:proto_common_bzl",
Expand Down
3 changes: 2 additions & 1 deletion bazel/private/upb_proto_library_internal/cc_library_func.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
def upb_use_cpp_toolchain():
return use_cpp_toolchain()

def cc_library_func(ctx, name, hdrs, srcs, copts, dep_ccinfos, includes = []):
def cc_library_func(ctx, name, hdrs, srcs, copts, dep_ccinfos, includes = [], alwayslink = False):
"""Like cc_library(), but callable from rules.

Args:
Expand Down Expand Up @@ -54,6 +54,7 @@ def cc_library_func(ctx, name, hdrs, srcs, copts, dep_ccinfos, includes = []):
compilation_outputs = compilation_outputs,
linking_contexts = linking_contexts,
disallow_dynamic_library = cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "targets_windows") or not cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "supports_dynamic_linker"),
alwayslink = alwayslink,
)

return CcInfo(
Expand Down
Loading