Skip to content

Commit

Permalink
Fixed bazel configuration ambiguity for non HTTP3 builds
Browse files Browse the repository at this point in the history
To avoid ambiguity when building with //bazel:http3=False (on PPC
and Windows) this commit adds 2 new config_setting_groups and
updates the relevant select() statements.

Signed-off-by: Ted Poole <tpoole@redhat.com>
  • Loading branch information
tedjpoole committed Jun 3, 2024
1 parent 39e9b32 commit d910a0e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
16 changes: 16 additions & 0 deletions bazel/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,22 @@ selects.config_setting_group(
],
)

selects.config_setting_group(
name = "disable_http3_on_linux_ppc",
match_all = [
":disable_http3",
":linux_ppc",
],
)

selects.config_setting_group(
name = "disable_http3_on_windows_x86_64",
match_all = [
":disable_http3",
":windows_x86_64",
],
)

config_setting(
name = "disable_admin_html",
values = {"define": "admin_html=disabled"},
Expand Down
3 changes: 2 additions & 1 deletion source/exe/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ envoy_cc_library(
] + select({
"//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS),
"//bazel:linux_ppc": envoy_all_extensions(PPC_SKIP_TARGETS),
"//bazel:disable_http3": envoy_all_extensions(NO_HTTP3_SKIP_TARGETS),
"//bazel:disable_http3_on_windows_x86_64": envoy_all_extensions(NO_HTTP3_SKIP_TARGETS + WINDOWS_SKIP_TARGETS),
"//bazel:disable_http3_on_linux_ppc": envoy_all_extensions(NO_HTTP3_SKIP_TARGETS + PPC_SKIP_TARGETS),
"//conditions:default": envoy_all_extensions(),
}),
)
Expand Down
3 changes: 2 additions & 1 deletion test/config_test/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ envoy_cc_test_library(
] + select({
"//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS),
"//bazel:linux_ppc": envoy_all_extensions(PPC_SKIP_TARGETS),
"//bazel:disable_http3": envoy_all_extensions(NO_HTTP3_SKIP_TARGETS),
"//bazel:disable_http3_on_windows_x86_64": envoy_all_extensions(NO_HTTP3_SKIP_TARGETS + WINDOWS_SKIP_TARGETS),
"//bazel:disable_http3_on_linux_ppc": envoy_all_extensions(NO_HTTP3_SKIP_TARGETS + PPC_SKIP_TARGETS),
"//conditions:default": envoy_all_extensions(),
}),
)

0 comments on commit d910a0e

Please sign in to comment.