diff --git a/python/private/BUILD.bazel b/python/private/BUILD.bazel index b4084fb7f..6fb4a1ccc 100644 --- a/python/private/BUILD.bazel +++ b/python/private/BUILD.bazel @@ -177,7 +177,6 @@ bzl_library( deps = [ ":auth_bzl", ":bazel_tools_bzl", - ":bzlmod_enabled_bzl", ":coverage_deps_bzl", ":full_version_bzl", ":internal_config_repo_bzl", diff --git a/python/private/python.bzl b/python/private/python.bzl index 83bc43f92..12ab4bb48 100644 --- a/python/private/python.bzl +++ b/python/private/python.bzl @@ -228,7 +228,11 @@ def _python_impl(module_ctx): kwargs.update(py.config.kwargs.get(toolchain_info.python_version, {})) kwargs.update(py.config.kwargs.get(full_python_version, {})) kwargs.update(py.config.default) - python_register_toolchains(name = toolchain_info.name, **kwargs) + python_register_toolchains( + name = toolchain_info.name, + _internal_bzlmod_toolchain_call = True, + **kwargs + ) # Create the pythons_hub repo for the interpreter meta data and the # the various toolchains. diff --git a/python/private/python_register_toolchains.bzl b/python/private/python_register_toolchains.bzl index d20e04961..64b66d5a6 100644 --- a/python/private/python_register_toolchains.bzl +++ b/python/private/python_register_toolchains.bzl @@ -23,7 +23,6 @@ load( "TOOL_VERSIONS", "get_release_info", ) -load(":bzlmod_enabled.bzl", "BZLMOD_ENABLED") load(":coverage_deps.bzl", "coverage_dep") load(":full_version.bzl", "full_version") load(":python_repository.bzl", "python_repository") @@ -75,9 +74,8 @@ def python_register_toolchains( version. **kwargs: passed to each {obj}`python_repository` call. """ - - if BZLMOD_ENABLED: - # you cannot used native.register_toolchains when using bzlmod. + bzlmod_toolchain_call = kwargs.pop("_internal_bzlmod_toolchain_call", False) + if bzlmod_toolchain_call: register_toolchains = False base_url = kwargs.pop("base_url", DEFAULT_RELEASE_BASE_URL) @@ -169,7 +167,7 @@ def python_register_toolchains( ) # in bzlmod we write out our own toolchain repos - if BZLMOD_ENABLED: + if bzlmod_toolchain_call: return toolchains_repo(