Skip to content
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

Jump to bottom

Add build flags to allow overriding platforms used in transitions #263

Merged
merged 3 commits into from
Sep 20, 2023
Merged

Add build flags to allow overriding platforms used in transitions #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
550f471
Add build flags to allow overriding platforms used in transitions
brentleyjones Sep 20, 2023
272ae72
Formatting
brentleyjones Sep 20, 2023
a4331dd
Rename
brentleyjones Sep 20, 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
20 changes: 20 additions & 0 deletions configs/platforms.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,23 @@ APPLE_PLATFORMS_CONSTRAINTS = {
"@build_bazel_apple_support//constraints:simulator",
],
}

CPU_TO_DEFAULT_PLATFORM_NAME = {
"darwin_arm64": "macos_arm64",
"darwin_arm64e": "macos_arm64e",
"darwin_x86_64": "macos_x86_64",
"ios_arm64": "ios_arm64",
"ios_arm64e": "ios_arm64e",
"ios_x86_64": "ios_x86_64",
"ios_sim_arm64": "ios_sim_arm64",
"tvos_arm64": "tvos_arm64",
"tvos_x86_64": "tvos_x86_64",
"tvos_sim_arm64": "tvos_sim_arm64",
"visionos_arm64": "visionos_arm64",
"visionos_sim_arm64": "visionos_sim_arm64",
"visionos_x86_64": "visionos_x86_64",
"watchos_arm64": "watchos_arm64",
"watchos_arm64_32": "watchos_arm64_32",
"watchos_armv7k": "watchos_armv7k",
"watchos_x86_64": "watchos_x86_64",
}
15 changes: 12 additions & 3 deletions lib/transitions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,27 @@ def _macos_universal_transition_impl(settings, _attr):
return [
{
"//command_line_option:cpu": "darwin_arm64",
"//command_line_option:platforms": "//platforms:macos_arm64",
"//command_line_option:platforms": [
settings["//platforms:macos_arm64_platform"],
],
},
{
"//command_line_option:cpu": "darwin_x86_64",
"//command_line_option:platforms": "//platforms:macos_x86_64",
"//command_line_option:platforms": [
settings["//platforms:macos_x86_64_platform"],
],
},
]
else:
return settings

macos_universal_transition = transition(
implementation = _macos_universal_transition_impl,
inputs = ["//command_line_option:cpu", "//command_line_option:platforms"],
inputs = [
"//command_line_option:cpu",
"//command_line_option:platforms",
"//platforms:macos_x86_64_platform",
"//platforms:macos_arm64_platform",
],
outputs = ["//command_line_option:cpu", "//command_line_option:platforms"],
)
19 changes: 18 additions & 1 deletion platforms/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
load("//configs:platforms.bzl", "APPLE_PLATFORMS_CONSTRAINTS")
load(
"//configs:platforms.bzl",
"APPLE_PLATFORMS_CONSTRAINTS",
"CPU_TO_DEFAULT_PLATFORM_NAME",
)

package(default_visibility = ["//visibility:public"])

Expand All @@ -20,6 +24,19 @@ alias(
actual = "darwin_arm64",
)

alias(
name = "macos_arm64e",
actual = "darwin_arm64e",
)

[
label_flag(
name = platform + "_platform",
build_setting_default = platform,
)
for platform in CPU_TO_DEFAULT_PLATFORM_NAME.values()
]

# Consumed by bazel tests.
filegroup(
name = "for_bazel_tests",
Expand Down
32 changes: 11 additions & 21 deletions test/transitions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Dummy transitions for testing basic behavior"""

load("//configs:platforms.bzl", "CPU_TO_DEFAULT_PLATFORM_NAME")

_PLATFORM_TYPE_TO_CPUS_FLAG = {
"ios": "//command_line_option:ios_multi_cpus",
"macos": "//command_line_option:macos_cpus",
Expand All @@ -16,25 +18,9 @@ _PLATFORM_TYPE_TO_DEFAULT_ARCH = {
"watchos": "x86_64",
}

_CPU_TO_PLATFORM = {
"darwin_x86_64": "//platforms:macos_x86_64",
"darwin_arm64": "//platforms:macos_arm64",
"darwin_arm64e": "//platforms:darwin_arm64e",
"ios_x86_64": "//platforms:ios_x86_64",
"ios_arm64": "//platforms:ios_arm64",
"ios_sim_arm64": "//platforms:ios_sim_arm64",
"ios_arm64e": "//platforms:ios_arm64e",
"tvos_sim_arm64": "//platforms:tvos_sim_arm64",
"tvos_arm64": "//platforms:tvos_arm64",
"tvos_x86_64": "//platforms:tvos_x86_64",
"visionos_arm64": "//platforms:visionos_arm64",
"visionos_sim_arm64": "//platforms:visionos_sim_arm64",
"visionos_x86_64": "//platforms/simulator:visionos_x86_64",
"watchos_armv7k": "//platforms:watchos_armv7k",
"watchos_arm64": "//platforms:watchos_arm64",
"watchos_device_arm64": "//platforms:watchos_arm64",
"watchos_arm64_32": "//platforms:watchos_arm64_32",
"watchos_x86_64": "//platforms:watchos_x86_64",
_CPU_TO_DEFAULT_PLATFORM_FLAG = {
cpu: "//platforms:{}_platform".format(platform_name)
for cpu, platform_name in CPU_TO_DEFAULT_PLATFORM_NAME.items()
}

_supports_visionos = hasattr(apple_common.platform_type, "visionos")
Expand Down Expand Up @@ -112,7 +98,9 @@ def _command_line_options(*, apple_platforms = [], environment_arch = None, mini
),
"//command_line_option:fission": [],
"//command_line_option:grte_top": None,
"//command_line_option:platforms": [apple_platforms[0]] if apple_platforms else [_CPU_TO_PLATFORM[cpu]],
"//command_line_option:platforms": (
[apple_platforms[0]] if apple_platforms else [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]]
),
"//command_line_option:ios_minimum_os": _min_os_version_or_none(
minimum_os_version = minimum_os_version,
platform = "ios",
Expand Down Expand Up @@ -147,7 +135,9 @@ _apple_platform_transition_inputs = [
"//command_line_option:platforms",
"//command_line_option:tvos_cpus",
"//command_line_option:watchos_cpus",
] + (["//command_line_option:visionos_cpus"] if _supports_visionos else [])
] + _CPU_TO_DEFAULT_PLATFORM_FLAG.values() + (
["//command_line_option:visionos_cpus"] if _supports_visionos else []
)

_apple_rule_base_transition_outputs = [
"//command_line_option:apple configuration distinguisher",
Expand Down