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

[transitions] Do not remove cpus from configured target graph #2

Merged
merged 1 commit into from
Apr 14, 2023
Merged

[transitions] Do not remove cpus from configured target graph #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion rules/transition_support.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,13 @@ def _apple_rule_transition_impl(settings, attr):

# Transition ios_multi_cpus to to a single cpu when building for iOS.
# Rules using this transition (e.g., apple_framework_packaging, precompiled_apple_resource_bundle) don't need any artifacts from other archs.
ios_multi_cpus = cpu_string[4:] if platform_type == "ios" else settings["//command_line_option:ios_multi_cpus"]
#ios_multi_cpus = cpu_string[4:] if platform_type == "ios" else settings["//command_line_option:ios_multi_cpus"]

# NOTE(nmj): Removed the logic above, as it caused problems during the migration
# from rules_pods, where those libs used every CPU provided, and
# rules_ios only used one of the cpus, leading to a split configured
# target graph. Just use the CPUs that we were given on the CLI.
ios_multi_cpus = settings["//command_line_option:ios_multi_cpus"]

ret = {
"//command_line_option:apple configuration distinguisher": "applebin_" + platform_type,
Expand Down