Skip to content

Commit 4356597

Browse files
committed
iox-#1176 Improve compatibility with bazel 6.2
1 parent 8ccb733 commit 4356597

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,20 @@
1414
#
1515
# SPDX-License-Identifier: Apache-2.0
1616

17+
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
1718
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
1819

1920
exports_files(["LICENSE"])
2021

2122
exports_files(["VERSION"])
2223

24+
# values: auto, on, off
25+
string_flag(
26+
name = "feature_acl",
27+
build_setting_default = "auto",
28+
visibility = ["//visibility:public"],
29+
)
30+
2331
alias(
2432
name = "iceoryx_hoofs",
2533
actual = "//iceoryx_hoofs",
@@ -44,12 +52,6 @@ alias(
4452
visibility = ["//visibility:public"],
4553
)
4654

47-
alias(
48-
name = "feature_acl",
49-
actual = "//iceoryx_platform:feature_acl",
50-
visibility = ["//visibility:public"],
51-
)
52-
5355
# Execute `bazel run //:buildifier` to fix formating of all starlark files in the workspace
5456
buildifier(
5557
name = "buildifier",

iceoryx_platform/BUILD.bazel

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# SPDX-License-Identifier: Apache-2.0
1616

1717
load("@bazel_skylib//lib:selects.bzl", "selects")
18-
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
1918
load("@rules_cc//cc:defs.bzl", "cc_library")
2019
load("//bazel:configure_file.bzl", "configure_file")
2120
load("//bazel:configure_version.bzl", "configure_version")
@@ -67,23 +66,17 @@ configure_version(
6766
version_from = "//:VERSION",
6867
)
6968

70-
string_flag(
71-
name = "feature_acl",
72-
build_setting_default = "auto",
73-
visibility = ["//visibility:public"],
74-
)
75-
7669
config_setting(
7770
name = "acl_auto",
7871
flag_values = {
79-
":feature_acl": "auto",
72+
"//:feature_acl": "auto",
8073
},
8174
)
8275

8376
config_setting(
8477
name = "acl_enabled",
8578
flag_values = {
86-
":feature_acl": "on",
79+
"//:feature_acl": "on",
8780
},
8881
)
8982

0 commit comments

Comments
 (0)