diff --git a/lib/private/BUILD.bazel b/lib/private/BUILD.bazel index 7f8a79985..fb7386aaf 100644 --- a/lib/private/BUILD.bazel +++ b/lib/private/BUILD.bazel @@ -264,7 +264,6 @@ bzl_library( srcs = [ "platform_utils.bzl", "@host_platform//:constraints.bzl", # keep - "@local_config_platform//:constraints.bzl", # keep "@platforms//host:constraints.bzl", # keep ], visibility = ["//lib:__subpackages__"], diff --git a/lib/private/bats_toolchain.bzl b/lib/private/bats_toolchain.bzl index 700867415..260b9ff52 100644 --- a/lib/private/bats_toolchain.bzl +++ b/lib/private/bats_toolchain.bzl @@ -17,9 +17,9 @@ BATS_FILE_VERSIONS = { } BATS_CORE_TEMPLATE = """\ -load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS") load("@aspect_bazel_lib//lib/private:bats_toolchain.bzl", "bats_toolchain") load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") +load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS") copy_to_directory( name = "core", diff --git a/lib/private/copy_directory_toolchain.bzl b/lib/private/copy_directory_toolchain.bzl index cb92480d4..b425e61b7 100644 --- a/lib/private/copy_directory_toolchain.bzl +++ b/lib/private/copy_directory_toolchain.bzl @@ -104,7 +104,6 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:copy_directory_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) diff --git a/lib/private/copy_to_directory_toolchain.bzl b/lib/private/copy_to_directory_toolchain.bzl index 8bbb43839..025bd3e85 100644 --- a/lib/private/copy_to_directory_toolchain.bzl +++ b/lib/private/copy_to_directory_toolchain.bzl @@ -104,7 +104,6 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:copy_to_directory_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) diff --git a/lib/private/coreutils_toolchain.bzl b/lib/private/coreutils_toolchain.bzl index a28846486..18c11fd0d 100644 --- a/lib/private/coreutils_toolchain.bzl +++ b/lib/private/coreutils_toolchain.bzl @@ -153,7 +153,6 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:coreutils_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) diff --git a/lib/private/expand_template_toolchain.bzl b/lib/private/expand_template_toolchain.bzl index 9c0e6ab51..5d360d4f5 100644 --- a/lib/private/expand_template_toolchain.bzl +++ b/lib/private/expand_template_toolchain.bzl @@ -104,7 +104,6 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:expand_template_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) diff --git a/lib/private/jq_toolchain.bzl b/lib/private/jq_toolchain.bzl index f76eeefc8..f8cd0c7b3 100644 --- a/lib/private/jq_toolchain.bzl +++ b/lib/private/jq_toolchain.bzl @@ -121,7 +121,6 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:jq_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) diff --git a/lib/private/platform_utils.bzl b/lib/private/platform_utils.bzl index cad72db99..a4308fe27 100644 --- a/lib/private/platform_utils.bzl +++ b/lib/private/platform_utils.bzl @@ -1,6 +1,6 @@ """Utility functions for platforms""" -load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS") +load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS") def _host_platform_is_darwin(): return "@platforms//os:osx" in HOST_CONSTRAINTS diff --git a/lib/private/source_toolchains_repo.bzl b/lib/private/source_toolchains_repo.bzl index 98d695b0c..5356ae4f6 100644 --- a/lib/private/source_toolchains_repo.bzl +++ b/lib/private/source_toolchains_repo.bzl @@ -34,7 +34,6 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["{toolchain_type}"], - incompatible_use_toolchain_transition = True, ) """ diff --git a/lib/private/tar_toolchain.bzl b/lib/private/tar_toolchain.bzl index 900bb1afe..b58636d6c 100644 --- a/lib/private/tar_toolchain.bzl +++ b/lib/private/tar_toolchain.bzl @@ -152,14 +152,13 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:tar_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) build_content = """# @generated by @aspect_bazel_lib//lib/private:tar_toolchain.bzl load(":defs.bzl", "resolved_toolchain") -load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS") +load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS") resolved_toolchain(name = "resolved_toolchain", visibility = ["//visibility:public"])""" diff --git a/lib/private/utils.bzl b/lib/private/utils.bzl index b6edb46d8..4b16b146a 100644 --- a/lib/private/utils.bzl +++ b/lib/private/utils.bzl @@ -239,7 +239,7 @@ def _is_bazel_7_or_greater(): def is_bzlmod_enabled(): """Detect the value of the --enable_bzlmod flag""" - return str(Label("@//:BUILD.bazel")).startswith("@@") + return str(Label("//:BUILD.bazel")).startswith("@@") def _maybe_http_archive(**kwargs): """Adapts a maybe(http_archive, ...) to look like an http_archive. diff --git a/lib/private/yq_toolchain.bzl b/lib/private/yq_toolchain.bzl index 4aee1e0c1..09f3111b9 100644 --- a/lib/private/yq_toolchain.bzl +++ b/lib/private/yq_toolchain.bzl @@ -370,7 +370,6 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:yq_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) diff --git a/lib/private/zstd_toolchain.bzl b/lib/private/zstd_toolchain.bzl index a3ea44231..c58096ccf 100644 --- a/lib/private/zstd_toolchain.bzl +++ b/lib/private/zstd_toolchain.bzl @@ -141,14 +141,13 @@ def _resolved_toolchain_impl(ctx): resolved_toolchain = rule( implementation = _resolved_toolchain_impl, toolchains = ["@aspect_bazel_lib//lib:zstd_toolchain_type"], - incompatible_use_toolchain_transition = True, ) """ rctx.file("defs.bzl", starlark_content) build_content = """# @generated by @aspect_bazel_lib//lib/private:zstd_toolchain.bzl load(":defs.bzl", "resolved_toolchain") -load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS") +load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS") resolved_toolchain(name = "resolved_toolchain", visibility = ["//visibility:public"])"""