Skip to content

Commit 2d58766

Browse files
committed
iox-eclipse-iceoryx#2434: Remove --//:feature_acl=auto
1 parent 7592b2a commit 2d58766

File tree

3 files changed

+7
-43
lines changed

3 files changed

+7
-43
lines changed

.bazelrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ build --noenable_bzlmod
4545
# feature flags
4646
#
4747

48-
# value [auto, on, off]
49-
# 'auto' is platform dependent ('on' on Linux and QNX, 'off' on other OS) and the default value if the flag is not set
50-
#build --//:feature_acl=off
48+
# value [True, False]. Default: False.
49+
# Here we turn on the setting for Linux in this repo. Downstream consumers are unaffected.
50+
build:linux --//:feature_acl=True

BUILD.bazel

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@
1414
#
1515
# SPDX-License-Identifier: Apache-2.0
1616

17-
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
17+
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
1818
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
1919

2020
exports_files(["LICENSE"])
2121

2222
exports_files(["VERSION"])
2323

24-
# values: auto, on, off
25-
string_flag(
24+
bool_flag(
2625
name = "feature_acl",
27-
build_setting_default = "auto",
26+
build_setting_default = False,
2827
visibility = ["//visibility:public"],
2928
)
3029

iceoryx_platform/BUILD.bazel

+1-36
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#
1515
# SPDX-License-Identifier: Apache-2.0
1616

17-
load("@bazel_skylib//lib:selects.bzl", "selects")
1817
load("@rules_cc//cc:defs.bzl", "cc_library")
1918
load("//bazel:configure_file.bzl", "configure_file")
2019
load("//bazel:configure_version.bzl", "configure_version")
@@ -67,42 +66,8 @@ configure_version(
6766
)
6867

6968
config_setting(
70-
name = "acl_auto",
71-
flag_values = {
72-
"//:feature_acl": "auto",
73-
},
74-
)
75-
76-
config_setting(
77-
name = "acl_enabled",
78-
flag_values = {
79-
"//:feature_acl": "on",
80-
},
81-
)
82-
83-
selects.config_setting_group(
84-
name = "acl_linux_enabled",
85-
match_all = [
86-
":linux",
87-
":acl_auto",
88-
],
89-
)
90-
91-
selects.config_setting_group(
92-
name = "acl_qnx_enabled",
93-
match_all = [
94-
":qnx",
95-
":acl_auto",
96-
],
97-
)
98-
99-
selects.config_setting_group(
10069
name = "cfg_feature_acl",
101-
match_any = [
102-
":acl_enabled",
103-
":acl_linux_enabled",
104-
":acl_qnx_enabled",
105-
],
70+
flag_values = {"//:feature_acl": "True"},
10671
)
10772

10873
configure_file(

0 commit comments

Comments
 (0)