diff --git a/features.bzl b/features.bzl index 8ad5733..336af2f 100644 --- a/features.bzl +++ b/features.bzl @@ -3,13 +3,6 @@ load("@bazel_features_globals//:globals.bzl", "globals") load("//private:util.bzl", "ge") -_allow_unresolved_symlinks_flag = ( - # This flag was renamed in https://github.com/bazelbuild/bazel/pull/18313 - "allow_unresolved_symlinks" - if ge("7.0.0") - else "experimental_allow_unresolved_symlinks" -) - _cc = struct( # Whether @bazel_tools//tools/cpp:optional_current_cc_toolchain and the `mandatory` parameter # on find_cpp_toolchain are available (#17308). @@ -23,6 +16,15 @@ _external_deps = struct( is_bzlmod_enabled = str(Label("//:invalid")).startswith("@@"), ) +_flags = struct( + # This flag was renamed in https://github.com/bazelbuild/bazel/pull/18313 + allow_unresolved_symlinks_flag = ( + "allow_unresolved_symlinks" + if ge("7.0.0") + else "experimental_allow_unresolved_symlinks" + ) +) + _rules = struct( # Whether TemplateDict#add_joined allows the map_each callback to return a list of strings (#17306) template_dict_map_each_can_return_list = ge("6.1.0"), @@ -35,9 +37,9 @@ _toolchains = struct( ) bazel_features = struct( - allow_unresolved_symlinks_flag = _allow_unresolved_symlinks_flag, cc = _cc, external_deps = _external_deps, + flags = _flags, globals = globals, rules = _rules, toolchains = _toolchains,