Migrate usages of py_internal.cc_helper to @rules_cc

Author: hvadehra

python/private/BUILD.bazel

@@ -118,23 +118,17 @@ bzl_library(
     srcs = ["bzlmod_enabled.bzl"],
 )
 
-bzl_library(
-    name = "cc_helper_bzl",
-    srcs = ["cc_helper.bzl"],
-    deps = [":py_internal_bzl"],
-)
-
 bzl_library(
     name = "common_bzl",
     srcs = ["common.bzl"],
     deps = [
-        ":cc_helper_bzl",
         ":py_cc_link_params_info_bzl",
         ":py_info_bzl",
         ":py_internal_bzl",
         ":reexports_bzl",
         ":rules_cc_srcs_bzl",
         "@bazel_skylib//lib:paths",
+        "@rules_cc//cc/common:cc_helper_bzl",
     ],
 )
 
@@ -404,7 +398,6 @@ bzl_library(
     srcs = ["py_executable.bzl"],
     deps = [
         ":attributes_bzl",
-        ":cc_helper_bzl",
         ":common_bzl",
         ":common_labels_bzl",
         ":flags_bzl",
@@ -422,6 +415,9 @@ bzl_library(
         "@bazel_skylib//lib:paths",
         "@bazel_skylib//lib:structs",
         "@bazel_skylib//rules:common_settings",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
+        "@rules_cc//cc/common",
+        "@rules_cc//cc/common:cc_helper_bzl",
     ],
 )
 

python/private/common.bzl

@@ -15,8 +15,8 @@
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_helper.bzl", "cc_helper")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
-load(":cc_helper.bzl", "cc_helper")
 load(":py_cc_link_params_info.bzl", "PyCcLinkParamsInfo")
 load(":py_info.bzl", "PyInfo", "PyInfoBuilder")
 load(":py_internal.bzl", "py_internal")

python/private/py_executable.bzl

@@ -17,7 +17,9 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//lib:structs.bzl", "structs")
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
+load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_helper.bzl", "cc_helper")
 load("@rules_python_internal//:rules_python_config.bzl", rp_config = "config")
 load(":attr_builders.bzl", "attrb")
 load(
@@ -33,7 +35,6 @@ load(
     "apply_config_settings_attr",
 )
 load(":builders.bzl", "builders")
-load(":cc_helper.bzl", "cc_helper")
 load(
     ":common.bzl",
     "collect_cc_info",
@@ -1435,7 +1436,7 @@ def _write_build_data(ctx, central_uncachable_version_file, extra_write_build_da
             # https://github.com/bazelbuild/bazel/issues/9363
             "INFO_FILE": ctx.info_file.path,
             "OUTPUT": build_data.path,
-            "PLATFORM": cc_helper.find_cpp_toolchain(ctx).toolchain_id,
+            "PLATFORM": find_cc_toolchain(ctx).toolchain_id,
             "TARGET": str(ctx.label),
             "VERSION_FILE": version_file.path,
         }, extra_write_build_data_env),