Skip to content

Commit

Permalink
iox-#1176 Improve compatibility with bazel 6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
elBoberido committed Oct 15, 2024
1 parent 8ccb733 commit 4356597
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
14 changes: 8 additions & 6 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,20 @@
#
# SPDX-License-Identifier: Apache-2.0

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

exports_files(["LICENSE"])

exports_files(["VERSION"])

# values: auto, on, off
string_flag(
name = "feature_acl",
build_setting_default = "auto",
visibility = ["//visibility:public"],
)

alias(
name = "iceoryx_hoofs",
actual = "//iceoryx_hoofs",
Expand All @@ -44,12 +52,6 @@ alias(
visibility = ["//visibility:public"],
)

alias(
name = "feature_acl",
actual = "//iceoryx_platform:feature_acl",
visibility = ["//visibility:public"],
)

# Execute `bazel run //:buildifier` to fix formating of all starlark files in the workspace
buildifier(
name = "buildifier",
Expand Down
11 changes: 2 additions & 9 deletions iceoryx_platform/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# SPDX-License-Identifier: Apache-2.0

load("@bazel_skylib//lib:selects.bzl", "selects")
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
load("@rules_cc//cc:defs.bzl", "cc_library")
load("//bazel:configure_file.bzl", "configure_file")
load("//bazel:configure_version.bzl", "configure_version")
Expand Down Expand Up @@ -67,23 +66,17 @@ configure_version(
version_from = "//:VERSION",
)

string_flag(
name = "feature_acl",
build_setting_default = "auto",
visibility = ["//visibility:public"],
)

config_setting(
name = "acl_auto",
flag_values = {
":feature_acl": "auto",
"//:feature_acl": "auto",
},
)

config_setting(
name = "acl_enabled",
flag_values = {
":feature_acl": "on",
"//:feature_acl": "on",
},
)

Expand Down

0 comments on commit 4356597

Please sign in to comment.