Skip to content

Commit 6d637f4

Browse files
comiuscopybara-github
comius
authored and
copybara-github
committed
Use constraints in global conditions instead of configuration flags.
I changed configuration settings in //src/conditions to use constraints instead of flags and then fixed some places where this is used. I fixed uses of darwin and darwin_x86_64, which using flags I believe is the same thing and using constraints actually becomes different. Added config_setting for linux. Used it where it makes sense. It cannot be used in tools/jdk/..., because it somehow gets new @bazel_tools and old @bazel_tools/constraints. This might break users of remote execution or cross compiling. The users working on a single platform should be safe. Closes #12427. PiperOrigin-RevId: 341408717
1 parent 5137f36 commit 6d637f4

14 files changed

Lines changed: 73 additions & 155 deletions

File tree

‎scripts/packages/BUILD‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ filegroup(
2929
":without-jdk/install.sh",
3030
":generate-package-info",
3131
],
32-
"//src/conditions:darwin_x86_64": [
33-
":with-jdk/install.sh",
34-
":without-jdk/install.sh",
35-
":generate-package-info",
36-
],
3732
"//conditions:default": [
3833
":with-jdk/install.sh",
3934
":without-jdk/install.sh",

‎src/BUILD‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ md5_cmd = "set -e -o pipefail && %s $(SRCS) | %s | %s > $@"
2424
outs = ["install_base_key" + suffix],
2525
cmd = select({
2626
"//src/conditions:darwin": md5_cmd % ("/sbin/md5", "/sbin/md5", "head -c 32"),
27-
"//src/conditions:darwin_x86_64": md5_cmd % ("/sbin/md5", "/sbin/md5", "head -c 32"),
2827
"//src/conditions:freebsd": md5_cmd % ("/sbin/md5", "/sbin/md5", "head -c 32"),
2928
# We avoid using the `head` tool's `-c` option, since it does not exist
3029
# on OpenBSD.
@@ -133,9 +132,6 @@ JAVA_TOOLS = [
133132
"//src/conditions:darwin": [
134133
":darwin_tools",
135134
],
136-
"//src/conditions:darwin_x86_64": [
137-
":darwin_tools",
138-
],
139135
"//conditions:default": [
140136
":dummy_darwin_tools",
141137
],
@@ -173,9 +169,6 @@ filegroup(
173169
"//src/conditions:darwin": [
174170
"@openjdk_macos//file",
175171
],
176-
"//src/conditions:darwin_x86_64": [
177-
"@openjdk_macos//file",
178-
],
179172
"//src/conditions:windows": [
180173
"@openjdk_win//file",
181174
],
@@ -195,9 +188,6 @@ filegroup(
195188
"//src/conditions:darwin": [
196189
"@openjdk_macos_minimal//file",
197190
],
198-
"//src/conditions:darwin_x86_64": [
199-
"@openjdk_macos_minimal//file",
200-
],
201191
"//src/conditions:windows": [
202192
"@openjdk_win_minimal//file",
203193
],
@@ -217,9 +207,6 @@ filegroup(
217207
"//src/conditions:darwin": [
218208
"@openjdk_macos_vanilla//file",
219209
],
220-
"//src/conditions:darwin_x86_64": [
221-
"@openjdk_macos_vanilla//file",
222-
],
223210
"//src/conditions:windows": [
224211
"@openjdk_win_vanilla//file",
225212
],
@@ -625,9 +612,8 @@ JAVA_VERSIONS = ("11",)
625612
"--platform",
626613
] + select({
627614
"//src/conditions:darwin": ["darwin"],
628-
"//src/conditions:darwin_x86_64": ["darwin_x86_64"],
629615
"//src/conditions:windows": ["windows"],
630-
"//src/conditions:linux_x86_64": ["linux"],
616+
"//src/conditions:linux": ["linux"],
631617
"//conditions:default": ["unknown"],
632618
}),
633619
data = [":java_tools_dist_java" + java_version],
@@ -716,9 +702,8 @@ JAVA_VERSIONS = ("11",)
716702
"--platform",
717703
] + select({
718704
"//src/conditions:darwin": ["darwin"],
719-
"//src/conditions:darwin_x86_64": ["darwin_x86_64"],
720705
"//src/conditions:windows": ["windows"],
721-
"//src/conditions:linux_x86_64": ["linux"],
706+
"//src/conditions:linux": ["linux"],
722707
"//conditions:default": ["unknown"],
723708
}),
724709
data = [":java_tools_java" + java_version + "_zip"],

‎src/conditions/BUILD‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,66 +13,96 @@ filegroup(
1313
visibility = ["//src:__pkg__"],
1414
)
1515

16-
# There is no config_setting for "linux".
17-
# See https://github.com/bazelbuild/bazel/issues/11107
16+
config_setting(
17+
name = "linux",
18+
constraint_values = ["@platforms//os:linux"],
19+
visibility = ["//visibility:public"],
20+
)
1821

1922
config_setting(
2023
name = "linux_aarch64",
21-
values = {"cpu": "aarch64"},
24+
constraint_values = [
25+
"@platforms//os:linux",
26+
"@platforms//cpu:aarch64",
27+
],
2228
visibility = ["//visibility:public"],
2329
)
2430

2531
config_setting(
2632
name = "linux_arm",
27-
values = {"cpu": "arm"},
33+
constraint_values = [
34+
"@platforms//os:linux",
35+
"@platforms//cpu:arm",
36+
],
2837
visibility = ["//visibility:public"],
2938
)
3039

3140
config_setting(
3241
name = "linux_ppc",
33-
values = {"cpu": "ppc"},
42+
constraint_values = [
43+
"@platforms//os:linux",
44+
"@platforms//cpu:ppc",
45+
],
3446
visibility = ["//visibility:public"],
3547
)
3648

3749
config_setting(
3850
name = "linux_ppc64le",
39-
values = {"cpu": "ppc"},
51+
constraint_values = [
52+
"@platforms//os:linux",
53+
"@platforms//cpu:ppc",
54+
],
4055
visibility = ["//visibility:public"],
4156
)
4257

4358
config_setting(
4459
name = "linux_s390x",
45-
values = {"cpu": "s390x"},
60+
constraint_values = [
61+
"@platforms//os:linux",
62+
"@platforms//cpu:s390x",
63+
],
4664
visibility = ["//visibility:public"],
4765
)
4866

4967
config_setting(
5068
name = "linux_x86_64",
51-
values = {"cpu": "k8"},
69+
constraint_values = [
70+
"@platforms//os:linux",
71+
"@platforms//cpu:x86_64",
72+
],
5273
visibility = ["//visibility:public"],
5374
)
5475

5576
config_setting(
5677
name = "darwin",
57-
values = {"cpu": "darwin"},
78+
constraint_values = ["@platforms//os:macos"],
5879
visibility = ["//visibility:public"],
5980
)
6081

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

6791
config_setting(
6892
name = "darwin_arm64",
69-
values = {"cpu": "darwin_arm64"},
93+
constraint_values = [
94+
"@platforms//os:macos",
95+
"@platforms//cpu:arm64",
96+
],
7097
visibility = ["//visibility:public"],
7198
)
7299

73100
config_setting(
74101
name = "darwin_arm64e",
75-
values = {"cpu": "darwin_arm64e"},
102+
constraint_values = [
103+
"@platforms//os:macos",
104+
"@platforms//cpu:arm64e",
105+
],
76106
visibility = ["//visibility:public"],
77107
)
78108

@@ -84,25 +114,25 @@ config_setting(
84114

85115
config_setting(
86116
name = "freebsd",
87-
values = {"cpu": "freebsd"},
117+
constraint_values = ["@platforms//os:freebsd"],
88118
visibility = ["//visibility:public"],
89119
)
90120

91121
config_setting(
92122
name = "openbsd",
93-
values = {"cpu": "openbsd"},
123+
constraint_values = ["@platforms//os:openbsd"],
94124
visibility = ["//visibility:public"],
95125
)
96126

97127
config_setting(
98128
name = "windows",
99-
values = {"cpu": "x64_windows"},
129+
constraint_values = ["@platforms//os:windows"],
100130
visibility = ["//visibility:public"],
101131
)
102132

103133
config_setting(
104134
name = "arm",
105-
values = {"cpu": "arm"},
135+
constraint_values = ["@platforms//cpu:arm"],
106136
visibility = ["//visibility:public"],
107137
)
108138

‎src/conditions/BUILD.tools‎

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,82 @@
11
config_setting(
22
name = "freebsd",
3-
values = {"cpu": "freebsd"},
3+
constraint_values = [ "@platforms//os:freebsd"],
44
visibility = ["//visibility:public"],
55
)
66

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

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

1919
config_setting(
2020
name = "linux_ppc",
21-
values = {"cpu": "ppc"},
21+
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
2222
visibility = ["//visibility:public"],
2323
)
2424

2525
config_setting(
2626
name = "linux_ppc64le",
27-
values = {"cpu": "ppc"},
27+
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:ppc" ],
2828
visibility = ["//visibility:public"],
2929
)
3030

3131
config_setting(
3232
name = "linux_s390x",
33-
values = {"cpu": "s390x"},
33+
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:s390x" ],
3434
visibility = ["//visibility:public"],
3535
)
3636

3737
config_setting(
3838
name = "linux_x86_64",
39-
values = {"cpu": "k8"},
39+
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64" ],
4040
visibility = ["//visibility:public"],
4141
)
4242

4343
config_setting(
4444
name = "linux_aarch64",
45-
values = {"cpu": "aarch64"},
45+
constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64" ],
4646
visibility = ["//visibility:public"],
4747
)
4848

4949
config_setting(
5050
name = "darwin_x86_64",
51-
values = {"cpu": "darwin_x86_64"},
51+
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:x86_64" ],
5252
visibility = ["//visibility:public"],
5353
)
5454

5555
config_setting(
5656
name = "darwin_arm64",
57-
values = {"cpu": "darwin_arm64"},
57+
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64" ],
5858
visibility = ["//visibility:public"],
5959
)
6060

6161
config_setting(
6262
name = "darwin_arm64e",
63-
values = {"cpu": "darwin_arm64e"},
63+
constraint_values = [ "@platforms//os:macos", "@platforms//cpu:arm64e" ],
6464
visibility = ["//visibility:public"],
6565
)
6666

6767
config_setting(
6868
name = "windows",
69-
values = {"cpu": "x64_windows"},
70-
visibility = ["//visibility:public"],
71-
)
72-
73-
config_setting(
74-
name = "windows_msvc",
75-
values = {"cpu": "x64_windows_msvc"},
76-
visibility = ["//visibility:public"],
77-
)
78-
79-
config_setting(
80-
name = "windows_msys",
81-
values = {"cpu": "x64_windows_msys"},
69+
constraint_values = [ "@platforms//os:windows"],
8270
visibility = ["//visibility:public"],
8371
)
8472

73+
# TODO: figure out how to base this selection on constraints
8574
config_setting(
8675
name = "host_windows",
8776
values = {"host_cpu": "x64_windows"},
8877
visibility = ["//visibility:public"],
8978
)
9079

91-
config_setting(
92-
name = "host_windows_msvc",
93-
values = {"host_cpu": "x64_windows_msvc"},
94-
visibility = ["//visibility:public"],
95-
)
96-
97-
config_setting(
98-
name = "host_windows_msys",
99-
values = {"host_cpu": "x64_windows_msys"},
100-
visibility = ["//visibility:public"],
101-
)
102-
10380
config_setting(
10481
name = "remote",
10582
values = {"define": "EXECUTOR=remote"},

‎src/main/cpp/BUILD‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ cc_library(
2424
"blaze_util_darwin.cc",
2525
"blaze_util_posix.cc",
2626
],
27-
"//src/conditions:darwin_x86_64": [
28-
"blaze_util_darwin.cc",
29-
"blaze_util_posix.cc",
30-
],
31-
"//src/conditions:darwin_arm64": [
32-
"blaze_util_darwin.cc",
33-
"blaze_util_posix.cc",
34-
],
35-
"//src/conditions:darwin_arm64e": [
36-
"blaze_util_darwin.cc",
37-
"blaze_util_posix.cc",
38-
],
3927
"//src/conditions:freebsd": [
4028
"blaze_util_bsd.cc",
4129
"blaze_util_posix.cc",
@@ -60,15 +48,6 @@ cc_library(
6048
"//src/conditions:darwin": [
6149
"-framework CoreFoundation",
6250
],
63-
"//src/conditions:darwin_x86_64": [
64-
"-framework CoreFoundation",
65-
],
66-
"//src/conditions:darwin_arm64": [
67-
"-framework CoreFoundation",
68-
],
69-
"//src/conditions:darwin_arm64e": [
70-
"-framework CoreFoundation",
71-
],
7251
"//src/conditions:freebsd": [
7352
],
7453
"//src/conditions:openbsd": [
@@ -128,12 +107,6 @@ cc_binary(
128107
linkopts = select({
129108
"//src/conditions:darwin": [
130109
],
131-
"//src/conditions:darwin_x86_64": [
132-
],
133-
"//src/conditions:darwin_arm64": [
134-
],
135-
"//src/conditions:darwin_arm64e": [
136-
],
137110
"//src/conditions:freebsd": [
138111
"-lprocstat",
139112
"-lm",

‎src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ filegroup(
7070
name = "qemu2_x86",
7171
srcs = ["emulator/emulator"] + select({
7272
"@bazel_tools//src/conditions:darwin": ["emulator/qemu/darwin-x86_64/qemu-system-i386"],
73-
"@bazel_tools//src/conditions:darwin_x86_64": ["emulator/qemu/darwin-x86_64/qemu-system-i386"],
7473
"//conditions:default": ["emulator/qemu/linux-x86_64/qemu-system-i386"],
7574
}),
7675
)

0 commit comments

Comments
 (0)