Skip to content

Use platforms inside Apple rules transitions #2256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keith merged 5 commits into from
Sep 19, 2023
Merged

Use platforms inside Apple rules transitions #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
713dba0
Use platforms inside Apple rules transitions
keith Sep 19, 2023
6208394
versiobn check
keith Sep 19, 2023
71d9e3a
Discard changes to platform_mappings
keith Sep 19, 2023
d36bbb5
Discard changes to README.md
keith Sep 19, 2023
972c13a
Update README.md
keith Sep 19, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repository.
page](https://github.com/bazelbuild/rules_apple/releases).
2. Copy the
[`platform_mappings`](https://github.com/bazelbuild/rules_apple/blob/master/platform_mappings)
file to the root of your repo
file to the root of your repo (only required for bazel 6.x)

## Examples

Expand Down
38 changes: 32 additions & 6 deletions apple/internal/transition_support.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ load(
)

_supports_visionos = hasattr(apple_common.platform_type, "visionos")
_is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition")

_PLATFORM_TYPE_TO_CPUS_FLAG = {
"ios": "//command_line_option:ios_multi_cpus",
Expand All @@ -48,6 +49,29 @@ _PLATFORM_TYPE_TO_CPUS_FLAG = {
"watchos": "//command_line_option:watchos_cpus",
}

# Following map provides and ad-hoc platform mapping
# It's no longer needed once --apple_platforms is set everywhere and toolchain resolution enabled
_CPU_TO_PLATFORM = {
"darwin_x86_64": "@build_bazel_apple_support//platforms:macos_x86_64",
"darwin_arm64": "@build_bazel_apple_support//platforms:macos_arm64",
"darwin_arm64e": "@build_bazel_apple_support//platforms:darwin_arm64e",
"ios_x86_64": "@build_bazel_apple_support//platforms:ios_x86_64",
"ios_arm64": "@build_bazel_apple_support//platforms:ios_arm64",
"ios_sim_arm64": "@build_bazel_apple_support//platforms:ios_sim_arm64",
"ios_arm64e": "@build_bazel_apple_support//platforms:ios_arm64e",
"tvos_sim_arm64": "@build_bazel_apple_support//platforms:tvos_sim_arm64",
"tvos_arm64": "@build_bazel_apple_support//platforms:tvos_arm64",
"tvos_x86_64": "@build_bazel_apple_support//platforms:tvos_x86_64",
"visionos_arm64": "@build_bazel_apple_support//platforms:visionos_arm64",
"visionos_sim_arm64": "@build_bazel_apple_support//platforms:visionos_sim_arm64",
"visionos_x86_64": "@build_bazel_apple_support//platforms/simulator:visionos_x86_64",
"watchos_armv7k": "@build_bazel_apple_support//platforms:watchos_armv7k",
"watchos_arm64": "@build_bazel_apple_support//platforms:watchos_arm64",
"watchos_device_arm64": "@build_bazel_apple_support//platforms:watchos_arm64",
"watchos_arm64_32": "@build_bazel_apple_support//platforms:watchos_arm64_32",
"watchos_x86_64": "@build_bazel_apple_support//platforms:watchos_x86_64",
}

def _platform_specific_cpu_setting_name(platform_type):
"""Returns the name of a platform-specific CPU setting.

Expand Down Expand Up @@ -237,7 +261,13 @@ def _command_line_options(
Returns:
A dictionary of `"//command_line_option"`s defined for the current target.
"""
cpu = _cpu_string(
environment_arch = environment_arch,
platform_type = platform_type,
settings = settings,
)

default_platforms = [_CPU_TO_PLATFORM[cpu]] if _is_bazel_7 else []
return {
build_settings_labels.use_tree_artifacts_outputs: force_bundle_outputs if force_bundle_outputs else settings[build_settings_labels.use_tree_artifacts_outputs],
"//command_line_option:apple configuration distinguisher": "applebin_" + platform_type,
Expand All @@ -247,17 +277,13 @@ def _command_line_options(
# architecture and environment, therefore we set `environment_arch` when it is available.
"//command_line_option:apple_split_cpu": environment_arch if environment_arch else "",
"//command_line_option:compiler": None,
"//command_line_option:cpu": _cpu_string(
environment_arch = environment_arch,
platform_type = platform_type,
settings = settings,
),
"//command_line_option:cpu": cpu,
"//command_line_option:crosstool_top": (
settings["//command_line_option:apple_crosstool_top"]
),
"//command_line_option:fission": [],
"//command_line_option:grte_top": None,
"//command_line_option:platforms": [apple_platforms[0]] if apple_platforms else [],
"//command_line_option:platforms": [apple_platforms[0]] if apple_platforms else default_platforms,
"//command_line_option:ios_minimum_os": _min_os_version_or_none(
minimum_os_version = minimum_os_version,
platform = "ios",
Expand Down