Skip to content
Open
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
1 change: 1 addition & 0 deletions cc/private/toolchain/unix_cc_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,7 @@ def _impl(ctx):
)
set_install_name_feature = feature(
name = "set_soname",
enabled = True,
flag_sets = [
flag_set(
actions = [
Expand Down
17 changes: 12 additions & 5 deletions cc/toolchains/args/soname_flags/BUILD
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
load("//cc/toolchains:args.bzl", "cc_args")
load("//cc/toolchains:feature.bzl", "cc_feature")
load("//cc/toolchains:feature_set.bzl", "cc_feature_set")

cc_feature(
cc_feature_set(
name = "feature",
args = select({
"//cc/settings:apple_constraint": [":apple_set_install_name"],
all_of = select({
"//cc/settings:apple_constraint": [":set_install_name_feature"],
"@platforms//os:linux": [":set_soname_feature"],
"//conditions:default": [],
}),
feature_name = "_soname_flags", # Doesn't override legacy feature, but shouldn't be disabled
visibility = ["//visibility:public"],
)

cc_feature(
name = "set_install_name_feature",
args = [":apple_set_install_name"],
feature_name = "set_install_name", # Doesn't override legacy feature, but shouldn't be disabled, mirrors default toolchain name
)

cc_args(
name = "apple_set_install_name",
actions = ["//cc/toolchains/actions:dynamic_library_link_actions"],
Expand All @@ -23,7 +30,7 @@ cc_args(
cc_feature(
name = "set_soname_feature",
args = [":set_soname"],
feature_name = "set_soname",
feature_name = "set_soname", # Feature name is important and read by rules_cc
visibility = ["//visibility:public"],
)

Expand Down
6 changes: 5 additions & 1 deletion tests/builtins_bzl/cc/cc_shared_library/test/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,11 @@ filegroup(

cc_shared_library(
name = "renamed_so_file",
features = ["windows_export_all_symbols"],
features = [
# This library is copied to a different basename above.
"-set_soname",
"windows_export_all_symbols",
],
shared_lib_name = "renamed_so_file.so",
deps = [
":direct_so_file_cc_lib2",
Expand Down