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 windows_msvc back to conditions in bazel_tools. #12668

Closed
wants to merge 1 commit into from
Closed

Add windows_msvc back to conditions in bazel_tools. #12668

Show file tree
Hide file tree
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
6 changes: 0 additions & 6 deletions src/conditions/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,6 @@ config_setting(
visibility = ["//visibility:public"],
)

config_setting(
name = "windows_msvc",
values = {"cpu": "x64_windows_msvc"},
visibility = ["//visibility:public"],
)

config_setting(
name = "arm",
constraint_values = ["@platforms//cpu:arm"],
Expand Down
55 changes: 43 additions & 12 deletions src/conditions/BUILD.tools
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,103 @@
config_setting(
name = "freebsd",
constraint_values = [ "@platforms//os:freebsd"],
constraint_values = ["@platforms//os:freebsd"],
visibility = ["//visibility:public"],
)

config_setting(
name = "openbsd",
constraint_values = [ "@platforms//os:openbsd"],
constraint_values = ["@platforms//os:openbsd"],
visibility = ["//visibility:public"],
)

config_setting(
name = "darwin",
constraint_values = [ "@platforms//os:macos" ],
constraint_values = ["@platforms//os:macos"],
visibility = ["//visibility:public"],
)

config_setting(
name = "linux_ppc",
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:ppc",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "linux_ppc64le",
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:ppc",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "linux_s390x",
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:s390x" ],
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:s390x",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "linux_x86_64",
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64" ],
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:x86_64",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "linux_aarch64",
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64" ],
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:aarch64",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "darwin_x86_64",
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:x86_64" ],
constraint_values = [
"@platforms//os:macos",
"@platforms//cpu:x86_64",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "darwin_arm64",
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64" ],
constraint_values = [
"@platforms//os:macos",
"@platforms//cpu:arm64",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "darwin_arm64e",
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64e" ],
constraint_values = [
"@platforms//os:macos",
"@platforms//cpu:arm64e",
],
visibility = ["//visibility:public"],
)

config_setting(
name = "windows",
constraint_values = [ "@platforms//os:windows"],
constraint_values = ["@platforms//os:windows"],
visibility = ["//visibility:public"],
)

# TODO: figure out how to base this selection on constraints
config_setting(
name = "windows_msvc",
values = {"cpu": "x64_windows_msvc"},
visibility = ["//visibility:public"],
)

Expand Down