Skip to content

Commit f6d30cf

Browse files
comiusmeisterT
authored andcommitted
Add windows_msvc back to conditions in bazel_tools.
This is partial revert of 6d637f4 and a fix to a06d7e1, which went into wrong file. windows_msvc condition is used downstream by tensorflow via ruy. The culprit line is in https://github.com/google/ruy/blob/master/ruy/build_defs.bzl#L60 (and #L67,#L77). Closes bazelbuild#12668. PiperOrigin-RevId: 346540473
1 parent 4158a6f commit f6d30cf

File tree

1 file changed

+43
-12
lines changed

1 file changed

+43
-12
lines changed

src/conditions/BUILD.tools

+43-12
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,103 @@
11
config_setting(
22
name = "freebsd",
3-
constraint_values = [ "@platforms//os:freebsd"],
3+
constraint_values = ["@platforms//os:freebsd"],
44
visibility = ["//visibility:public"],
55
)
66

77
config_setting(
88
name = "openbsd",
9-
constraint_values = [ "@platforms//os:openbsd"],
9+
constraint_values = ["@platforms//os:openbsd"],
1010
visibility = ["//visibility:public"],
1111
)
1212

1313
config_setting(
1414
name = "darwin",
15-
constraint_values = [ "@platforms//os:macos" ],
15+
constraint_values = ["@platforms//os:macos"],
1616
visibility = ["//visibility:public"],
1717
)
1818

1919
config_setting(
2020
name = "linux_ppc",
21-
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
21+
constraint_values = [
22+
"@platforms//os:linux",
23+
"@platforms//cpu:ppc",
24+
],
2225
visibility = ["//visibility:public"],
2326
)
2427

2528
config_setting(
2629
name = "linux_ppc64le",
27-
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
30+
constraint_values = [
31+
"@platforms//os:linux",
32+
"@platforms//cpu:ppc",
33+
],
2834
visibility = ["//visibility:public"],
2935
)
3036

3137
config_setting(
3238
name = "linux_s390x",
33-
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:s390x" ],
39+
constraint_values = [
40+
"@platforms//os:linux",
41+
"@platforms//cpu:s390x",
42+
],
3443
visibility = ["//visibility:public"],
3544
)
3645

3746
config_setting(
3847
name = "linux_x86_64",
39-
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64" ],
48+
constraint_values = [
49+
"@platforms//os:linux",
50+
"@platforms//cpu:x86_64",
51+
],
4052
visibility = ["//visibility:public"],
4153
)
4254

4355
config_setting(
4456
name = "linux_aarch64",
45-
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64" ],
57+
constraint_values = [
58+
"@platforms//os:linux",
59+
"@platforms//cpu:aarch64",
60+
],
4661
visibility = ["//visibility:public"],
4762
)
4863

4964
config_setting(
5065
name = "darwin_x86_64",
51-
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:x86_64" ],
66+
constraint_values = [
67+
"@platforms//os:macos",
68+
"@platforms//cpu:x86_64",
69+
],
5270
visibility = ["//visibility:public"],
5371
)
5472

5573
config_setting(
5674
name = "darwin_arm64",
57-
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64" ],
75+
constraint_values = [
76+
"@platforms//os:macos",
77+
"@platforms//cpu:arm64",
78+
],
5879
visibility = ["//visibility:public"],
5980
)
6081

6182
config_setting(
6283
name = "darwin_arm64e",
63-
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64e" ],
84+
constraint_values = [
85+
"@platforms//os:macos",
86+
"@platforms//cpu:arm64e",
87+
],
6488
visibility = ["//visibility:public"],
6589
)
6690

6791
config_setting(
6892
name = "windows",
69-
constraint_values = [ "@platforms//os:windows"],
93+
constraint_values = ["@platforms//os:windows"],
94+
visibility = ["//visibility:public"],
95+
)
96+
97+
# TODO: figure out how to base this selection on constraints
98+
config_setting(
99+
name = "windows_msvc",
100+
values = {"cpu": "x64_windows_msvc"},
70101
visibility = ["//visibility:public"],
71102
)
72103

0 commit comments

Comments
 (0)