Skip to content

Commit 46d5998

Browse files
gchateletgchatelet
committed
[bazel][NFC] Inline and simplify platform selection
1 parent df70a72 commit 46d5998

File tree

11 files changed

+20
-226
lines changed

11 files changed

+20
-226
lines changed

‎ortools/algorithms/BUILD.bazel‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@ package(default_visibility = ["//visibility:public"])
2020
# Description:
2121
# Home of algorithms used in OR solvers
2222

23-
config_setting(
24-
name = "on_linux",
25-
constraint_values = ["@platforms//os:linux"],
26-
)
27-
28-
config_setting(
29-
name = "on_macos",
30-
constraint_values = ["@platforms//os:macos"],
31-
)
32-
33-
config_setting(
34-
name = "on_windows",
35-
constraint_values = ["@platforms//os:windows"],
36-
)
37-
3823
# OSS solvers
3924
bool_flag(
4025
name = "with_cbc",
@@ -110,9 +95,7 @@ cc_test(
11095
name = "radix_sort_test",
11196
srcs = ["radix_sort_test.cc"],
11297
copts = select({
113-
"on_linux": [],
114-
"on_macos": [],
115-
"on_windows": ["/Zc:preprocessor"],
98+
"@platforms//os:windows": ["/Zc:preprocessor"],
11699
"//conditions:default": [],
117100
}),
118101
deps = [

‎ortools/base/BUILD.bazel‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
1616

1717
package(default_visibility = ["//visibility:public"])
1818

19-
config_setting(
20-
name = "on_linux",
21-
constraint_values = ["@platforms//os:linux"],
22-
)
23-
24-
config_setting(
25-
name = "on_macos",
26-
constraint_values = ["@platforms//os:macos"],
27-
)
28-
29-
config_setting(
30-
name = "on_windows",
31-
constraint_values = ["@platforms//os:windows"],
32-
)
33-
3419
filegroup(
3520
name = "base_swig",
3621
srcs = [
@@ -82,9 +67,7 @@ cc_library(
8267
"-DOR_TOOLS_PATCH=9999",
8368
],
8469
linkopts = select({
85-
"on_linux": [],
86-
"on_macos": ["-framework CoreFoundation"],
87-
"on_windows": [],
70+
"@platforms//os:macos": ["-framework CoreFoundation"],
8871
"//conditions:default": [],
8972
}),
9073
deps = [
@@ -180,9 +163,7 @@ cc_library(
180163
name = "dump_vars",
181164
hdrs = ["dump_vars.h"],
182165
copts = select({
183-
"on_linux": [],
184-
"on_macos": [],
185-
"on_windows": ["/Zc:preprocessor"],
166+
"@platforms//os:windows": ["/Zc:preprocessor"],
186167
"//conditions:default": [],
187168
}),
188169
deps = [
@@ -197,9 +178,7 @@ cc_test(
197178
size = "small",
198179
srcs = ["dump_vars_test.cc"],
199180
copts = select({
200-
"on_linux": [],
201-
"on_macos": [],
202-
"on_windows": ["/Zc:preprocessor"],
181+
"@platforms//os:windows": ["/Zc:preprocessor"],
203182
"//conditions:default": [],
204183
}),
205184
deps = [

‎ortools/constraint_solver/BUILD.bazel‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@ load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library")
2020
load("@rules_cc//cc:cc_library.bzl", "cc_library")
2121
load("@rules_python//python:py_library.bzl", "py_library")
2222

23-
config_setting(
24-
name = "on_linux",
25-
constraint_values = ["@platforms//os:linux"],
26-
)
27-
28-
config_setting(
29-
name = "on_macos",
30-
constraint_values = ["@platforms//os:macos"],
31-
)
32-
33-
config_setting(
34-
name = "on_windows",
35-
constraint_values = ["@platforms//os:windows"],
36-
)
37-
3823
proto_library(
3924
name = "assignment_proto",
4025
srcs = ["assignment.proto"],

‎ortools/flatzinc/BUILD.bazel‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,6 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
2020

2121
package(default_visibility = ["//visibility:public"])
2222

23-
config_setting(
24-
name = "on_linux",
25-
constraint_values = [
26-
"@platforms//os:linux",
27-
],
28-
)
29-
30-
config_setting(
31-
name = "on_macos",
32-
constraint_values = [
33-
"@platforms//os:macos",
34-
],
35-
)
36-
37-
config_setting(
38-
name = "on_windows",
39-
constraint_values = [
40-
"@platforms//os:windows",
41-
],
42-
)
43-
4423
# ---------------------------------------------------------------------------
4524
# Baseline flatzinc model.
4625
# ---------------------------------------------------------------------------
@@ -88,9 +67,8 @@ cc_library(
8867
name = "parser_lex_lib",
8968
srcs = ["parser.yy.cc"],
9069
copts = select({
91-
"on_linux": ["-Wno-unused-function"], # parser.yy.cc
92-
"on_macos": ["-Wno-unused-function"], # parser.yy.cc
93-
"on_windows": [],
70+
"@platforms//os:linux": ["-Wno-unused-function"], # parser.yy.cc
71+
"@platforms//os:macos": ["-Wno-unused-function"], # parser.yy.cc
9472
"//conditions:default": [],
9573
}),
9674
deps = [

‎ortools/glop/BUILD.bazel‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,13 @@ package(
2020
default_visibility = ["//visibility:public"],
2121
)
2222

23-
config_setting(
24-
name = "on_linux",
25-
constraint_values = [
26-
"@platforms//os:linux",
27-
],
28-
)
29-
30-
config_setting(
31-
name = "on_macos",
32-
constraint_values = [
33-
"@platforms//os:macos",
34-
],
35-
)
36-
37-
config_setting(
38-
name = "on_windows",
39-
constraint_values = [
40-
"@platforms//os:windows",
41-
],
42-
)
43-
4423
# Floating-point code in this directory must not be compiled with
4524
# dangerous optimizations. For example do not assume that FP expressions
4625
# are associative. This is what -fno-fast-math is for.
4726
SAFE_FP_CODE = select({
48-
"on_linux": ["-fno-fast-math"],
49-
"on_macos": [], # no_fast_math is the default.
50-
"on_windows": [], # /fp:precise is the default.
27+
"@platforms//os:linux": ["-fno-fast-math"],
28+
"@platforms//os:macos": [], # no_fast_math is the default.
29+
"@platforms//os:windows": [], # /fp:precise is the default.
5130
"//conditions:default": [],
5231
})
5332

‎ortools/graph/BUILD.bazel‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,6 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
1717
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1818
load("@rules_cc//cc:cc_test.bzl", "cc_test")
1919

20-
config_setting(
21-
name = "on_linux",
22-
constraint_values = ["@platforms//os:linux"],
23-
)
24-
25-
config_setting(
26-
name = "on_macos",
27-
constraint_values = ["@platforms//os:macos"],
28-
)
29-
30-
config_setting(
31-
name = "on_windows",
32-
constraint_values = ["@platforms//os:windows"],
33-
)
34-
3520
cc_library(
3621
name = "graph",
3722
hdrs = ["graph.h"],
@@ -533,9 +518,7 @@ cc_library(
533518
srcs = ["min_cost_flow.cc"],
534519
hdrs = ["min_cost_flow.h"],
535520
copts = select({
536-
"on_linux": [],
537-
"on_macos": [],
538-
"on_windows": ["/Zc:preprocessor"],
521+
"@platforms//os:windows": ["/Zc:preprocessor"],
539522
"//conditions:default": [],
540523
}),
541524
visibility = ["//visibility:public"],

‎ortools/lp_data/BUILD.bazel‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,13 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
1515

1616
package(default_visibility = ["//visibility:public"])
1717

18-
config_setting(
19-
name = "on_linux",
20-
constraint_values = [
21-
"@platforms//os:linux",
22-
],
23-
)
24-
25-
config_setting(
26-
name = "on_macos",
27-
constraint_values = [
28-
"@platforms//os:macos",
29-
],
30-
)
31-
32-
config_setting(
33-
name = "on_windows",
34-
constraint_values = [
35-
"@platforms//os:windows",
36-
],
37-
)
38-
3918
# Floating-point code in this directory must not be compiled with
4019
# dangerous optimizations. For example do not assume that FP expressions
4120
# are associative. This is what -fno-fast-math is for.
4221
SAFE_FP_CODE = select({
43-
"on_linux": ["-fno-fast-math"],
44-
"on_macos": [], # no_fast_math is the default.
45-
"on_windows": [], # /fp:precise is the default.
22+
"@platforms//os:linux": ["-fno-fast-math"],
23+
"@platforms//os:macos": [], # no_fast_math is the default.
24+
"@platforms//os:windows": [], # /fp:precise is the default.
4625
"//conditions:default": [],
4726
})
4827

‎ortools/routing/BUILD.bazel‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,6 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
1919

2020
package(default_visibility = ["//visibility:public"])
2121

22-
config_setting(
23-
name = "on_linux",
24-
constraint_values = ["@platforms//os:linux"],
25-
)
26-
27-
config_setting(
28-
name = "on_macos",
29-
constraint_values = ["@platforms//os:macos"],
30-
)
31-
32-
config_setting(
33-
name = "on_windows",
34-
constraint_values = ["@platforms//os:windows"],
35-
)
36-
3722
proto_library(
3823
name = "enums_proto",
3924
srcs = ["enums.proto"],
@@ -236,9 +221,7 @@ cc_library(
236221
"search.h",
237222
],
238223
copts = select({
239-
"on_linux": [],
240-
"on_macos": [],
241-
"on_windows": ["/Zc:preprocessor"],
224+
"@platforms//os:windows": ["/Zc:preprocessor"],
242225
"//conditions:default": [],
243226
}),
244227
deps = [

‎ortools/third_party_solvers/BUILD.bazel‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,11 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
1515

1616
package(default_visibility = ["//visibility:public"])
1717

18-
config_setting(
19-
name = "on_linux",
20-
constraint_values = ["@platforms//os:linux"],
21-
)
22-
23-
config_setting(
24-
name = "on_macos",
25-
constraint_values = ["@platforms//os:macos"],
26-
)
27-
28-
config_setting(
29-
name = "on_windows",
30-
constraint_values = ["@platforms//os:windows"],
31-
)
32-
3318
cc_library(
3419
name = "dynamic_library",
3520
hdrs = ["dynamic_library.h"],
3621
linkopts = select({
37-
"on_linux": ["-Wl,--no-as-needed -ldl"],
38-
"on_macos": [],
39-
"on_windows": [],
22+
"@platforms//os:linux": ["-Wl,--no-as-needed -ldl"],
4023
"//conditions:default": [],
4124
}),
4225
deps = [

‎ortools/util/BUILD.bazel‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,6 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
1818

1919
package(default_visibility = ["//visibility:public"])
2020

21-
config_setting(
22-
name = "on_linux",
23-
constraint_values = [
24-
"@platforms//os:linux",
25-
],
26-
)
27-
28-
config_setting(
29-
name = "on_macos",
30-
constraint_values = [
31-
"@platforms//os:macos",
32-
],
33-
)
34-
35-
config_setting(
36-
name = "on_windows",
37-
constraint_values = [
38-
"@platforms//os:windows",
39-
],
40-
)
41-
4221
# OptionalBoolean
4322
proto_library(
4423
name = "optional_boolean_proto",
@@ -132,9 +111,7 @@ cc_library(
132111
srcs = ["piecewise_linear_function.cc"],
133112
hdrs = ["piecewise_linear_function.h"],
134113
copts = select({
135-
"on_linux": [],
136-
"on_macos": [],
137-
"on_windows": ["/Zc:preprocessor"],
114+
"@platforms//os:windows": ["/Zc:preprocessor"],
138115
"//conditions:default": [],
139116
}),
140117
deps = [
@@ -244,9 +221,9 @@ cc_library(
244221
# You must also set this flag if you depend on this target and use
245222
# its methods related to IEEE-754 rounding modes.
246223
copts = select({
247-
"on_linux": ["-frounding-math"],
248-
"on_macos": ["-frounding-math"],
249-
"on_windows": [],
224+
"@platforms//os:linux": ["-frounding-math"],
225+
"@platforms//os:macos": ["-frounding-math"],
226+
"@platforms//os:windows": [],
250227
"//conditions:default": ["-frounding-math"],
251228
}),
252229
deps = [

0 commit comments

Comments
 (0)