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.

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

Correct cpu and os values of local_config_cc_toolchains targets #14844

Closed
Changes from all commits
Commits
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
44 changes: 22 additions & 22 deletions tools/osx/crosstool/BUILD.toolchains
Original file line number Diff line number Diff line change
Expand Up @@ -10,76 +10,76 @@ OSX_TOOLS_CONSTRAINTS = {
"armeabi-v7a": ["@platforms//cpu:arm"],
"darwin_arm64": [
"@platforms//os:osx",
"@platforms//cpu:aarch64",
"@platforms//cpu:arm64",
],
"darwin_arm64e": [
"@platforms//os:osx",
"@platforms//cpu:aarch64",
"@platforms//cpu:arm64",
],
"darwin_x86_64": [
"@platforms//os:osx",
"@platforms//cpu:x86_64",
],
"ios_arm64": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
"@platforms//cpu:arm64",
],
"ios_arm64e": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
"@platforms//cpu:arm64",
],
"ios_armv7": [
"@platforms//os:ios",
"@platforms//cpu:arm",
"@platforms//cpu:armv7",
],
"ios_i386": [
"@platforms//os:ios",
"@platforms//cpu:x86_32",
"@platforms//cpu:i386",
],
"ios_x86_64": [
"@platforms//os:ios",
"@platforms//cpu:x86_64",
],
"ios_sim_arm64": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
"@platforms//cpu:arm64",
],
Comment on lines 43 to 46
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some question as tvos

"tvos_arm64": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
"@platforms//os:tvos",
"@platforms//cpu:arm64",
],
"tvos_x86_64": [
"@platforms//os:ios",
"@platforms//os:tvos",
"@platforms//cpu:x86_64",
],
"tvos_sim_arm64": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
"@platforms//os:tvos",
"@platforms//cpu:arm64",
],
Comment on lines 55 to 58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wondered this in another context but is this one correct? since it's not actually different from tvos_arm64? maybe the name difference is enough?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A while back we checked in environment constraints for simulator, device, and catalyst into https://github.com/bazelbuild/apple_support/blob/master/constraints/BUILD, but I don't know enough about Bazel's toolchains in a multi-repo situation to know if those would be accessible from here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yea, those wouldn't from here

"watchos_arm64": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
"@platforms//os:watchos",
"@platforms//cpu:arm64",
],
"watchos_arm64_32": [
"@platforms//os:ios",
"@platforms//cpu:aarch64",
"@platforms//os:watchos",
"@platforms//cpu:arm64_32",
],
"watchos_armv7k": [
"@platforms//os:ios",
"@platforms//cpu:arm",
"@platforms//os:watchos",
"@platforms//cpu:armv7k",
],
"watchos_i386": [
"@platforms//os:ios",
"@platforms//cpu:x86_32",
"@platforms//os:watchos",
"@platforms//cpu:i386",
],
"watchos_x86_64": [
"@platforms//os:ios",
"@platforms//os:watchos",
"@platforms//cpu:x86_64",
],
}

OSX_DEVELOPER_PLATFORM_CPUS = [
"aarch64",
"arm64",
"x86_64",
]

Expand Down