Skip to content

Commit 510c9de

Browse files
Don't set the Apple Configuration Distinguisher. This is not necessary, and it is a no-op now. (#2836)
PiperOrigin-RevId: 585665894 (cherry picked from commit 4d95005) Co-authored-by: Nicholas Levin <[email protected]>
1 parent 636a4de commit 510c9de

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

apple/internal/transition_support.bzl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,11 @@ def _command_line_options(
246246
default_platforms = [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]] if _is_bazel_7 else []
247247
return {
248248
build_settings_labels.use_tree_artifacts_outputs: force_bundle_outputs if force_bundle_outputs else settings[build_settings_labels.use_tree_artifacts_outputs],
249-
"//command_line_option:apple configuration distinguisher": "applebin_" + platform_type,
250249
"//command_line_option:apple_platform_type": platform_type,
251250
"//command_line_option:apple_platforms": apple_platforms,
252-
# `apple_split_cpu` is used by the Bazel Apple configuration distinguisher to distinguish
253-
# architecture and environment, therefore we set `environment_arch` when it is available.
251+
# apple_split_cpu is still needed for Bazel built-in objc_library transition logic and Apple
252+
# fragment APIs, and it's also required to keep Bazel from optimizing away splits when deps
253+
# are identical between platforms.
254254
"//command_line_option:apple_split_cpu": environment_arch if environment_arch else "",
255255
"//command_line_option:compiler": None,
256256
"//command_line_option:cpu": cpu,
@@ -397,7 +397,6 @@ _apple_platform_transition_inputs = _apple_platforms_rule_base_transition_inputs
397397
]
398398
_apple_rule_base_transition_outputs = [
399399
build_settings_labels.use_tree_artifacts_outputs,
400-
"//command_line_option:apple configuration distinguisher",
401400
"//command_line_option:apple_platform_type",
402401
"//command_line_option:apple_platforms",
403402
"//command_line_option:apple_split_cpu",

0 commit comments

Comments
 (0)