Skip to content

Commit

Permalink
Correct cpu and os values of local_config_cc_toolchains targets
Browse files Browse the repository at this point in the history
These aren't being used now, but some of them are clearly defined
incorrectly. Fix them now to avoid surprises in the future. Also change
`aarch64` to `arm64` since `aarch64` is an alias of `arm64`.

Closes #14844.

PiperOrigin-RevId: 433061989
  • Loading branch information
thii authored and copybara-github committed Mar 7, 2022
1 parent caa0451 commit b858ec3
Showing 1 changed file with 22 additions and 22 deletions.
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",
],
"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",
],
"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

0 comments on commit b858ec3

Please sign in to comment.