Skip to content

Commit

Permalink
Use .dylib extension for macOS dynamic libraries in Unix toolchain
Browse files Browse the repository at this point in the history
The autoconfigured Unix toolchain previously did not set any artifact_name_patterns, which meant that all artifacts used the default(Linux) patterns. This was incorrect in the case of dynamic libraries on macOS, which should have the extension `.dylib` rather than `.so`.

Fixes bazelbuild#11082.

Closes bazelbuild#14158.

PiperOrigin-RevId: 413363126
  • Loading branch information
fmeum authored and copybara-github committed Dec 1, 2021
1 parent 0b02ea4 commit 3f1672e
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions tools/cpp/unix_cc_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
load(
"@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
"action_config",
"artifact_name_pattern",
"feature",
"feature_set",
"flag_group",
Expand Down Expand Up @@ -1185,6 +1186,8 @@ def _impl(ctx):

# TODO(#8303): Mac crosstool should also declare every feature.
if is_linux:
# Linux artifact name patterns are the default.
artifact_name_patterns = []
features = [
dependency_file_feature,
random_seed_feature,
Expand Down Expand Up @@ -1233,6 +1236,15 @@ def _impl(ctx):
unfiltered_compile_flags_feature,
] + layering_check_features(ctx.attr.compiler)
else:
# macOS artifact name patterns differ from the defaults only for dynamic
# libraries.
artifact_name_patterns = [
artifact_name_pattern(
category_name = "dynamic_library",
prefix = "lib",
extension = ".dylib",
),
]
features = [
supports_pic_feature,
] + (
Expand All @@ -1257,6 +1269,7 @@ def _impl(ctx):
ctx = ctx,
features = features,
action_configs = action_configs,
artifact_name_patterns = artifact_name_patterns,
cxx_builtin_include_directories = ctx.attr.cxx_builtin_include_directories,
toolchain_identifier = ctx.attr.toolchain_identifier,
host_system_name = ctx.attr.host_system_name,
Expand Down

0 comments on commit 3f1672e

Please sign in to comment.