Remove references to @bazel_tools//tools/cpp (#2885)

Signed-off-by: Aaron Sky <asky@dropbox.com>

Author: aaronsky

apple/BUILD

@@ -96,8 +96,8 @@ bzl_library(
         "//apple/internal:platform_support",
         "//apple/internal:providers",
         "@bazel_skylib//lib:dicts",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_apple_support//lib:apple_support",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 

apple/cc_toolchain_forwarder.bzl

@@ -20,15 +20,15 @@ load(
     "@bazel_skylib//lib:dicts.bzl",
     "dicts",
 )
-load(
-    "@bazel_tools//tools/cpp:toolchain_utils.bzl",
-    "find_cpp_toolchain",
-    "use_cpp_toolchain",
-)
 load(
     "@build_bazel_apple_support//lib:apple_support.bzl",
     "apple_support",
 )
+load(
+    "@rules_cc//cc:find_cc_toolchain.bzl",
+    "find_cc_toolchain",
+    "use_cc_toolchain",
+)
 load(
     "//apple/internal:platform_support.bzl",
     "platform_support",
@@ -38,7 +38,7 @@ visibility("public")
 
 def _cc_toolchain_forwarder_impl(ctx):
     return [
-        find_cpp_toolchain(ctx),
+        find_cc_toolchain(ctx),
         platform_support.apple_platform_info_from_rule_ctx(ctx),
     ]
 
@@ -49,7 +49,7 @@ cc_toolchain_forwarder = rule(
         {
             # Legacy style toolchain assignment.
             "_cc_toolchain": attr.label(
-                default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
+                default = Label("@rules_cc//cc:current_cc_toolchain"),
             ),
         },
     ),
@@ -60,5 +60,5 @@ for the purposes of understanding what constraints the results of each Apple spl
 resolve to from the perspective of any bundling and binary rules that generate "fat" Apple binaries.
 """,
     # Anticipated "new" toolchain assignment.
-    toolchains = use_cpp_toolchain(),
+    toolchains = use_cc_toolchain(),
 )

apple/internal/BUILD

@@ -71,8 +71,8 @@ bzl_library(
         "@bazel_skylib//lib:partial",
         "@bazel_skylib//lib:paths",
         "@bazel_skylib//lib:sets",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_rules_swift//swift",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 
@@ -125,9 +125,9 @@ bzl_library(
         "//apple/internal/aspects:swift_usage_aspect",
         "@bazel_skylib//lib:dicts",
         "@bazel_skylib//lib:paths",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_apple_support//lib:apple_support",
         "@build_bazel_rules_swift//swift",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 
@@ -324,10 +324,10 @@ bzl_library(
         "//apple/internal/utils:clang_rt_dylibs",
         "//apple/internal/utils:main_thread_checker_dylibs",
         "@bazel_skylib//lib:collections",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_apple_support//lib:apple_support",
         "@build_bazel_rules_swift//swift",
         "@build_bazel_rules_swift//swift:providers",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 
@@ -594,8 +594,8 @@ bzl_library(
         "//apple/internal/testing:apple_test_bundle_support",
         "//apple/internal/testing:apple_test_rule_support",
         "@bazel_skylib//lib:dicts",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_apple_support//lib:apple_support",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 
@@ -703,10 +703,10 @@ bzl_library(
         "//apple/internal/aspects:resource_aspect_hint",
         "//apple/internal/utils:clang_rt_dylibs",
         "//apple/internal/utils:main_thread_checker_dylibs",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_apple_support//lib:apple_support",
         "@build_bazel_rules_swift//swift",
         "@build_bazel_rules_swift//swift:providers",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 
@@ -743,8 +743,8 @@ bzl_library(
         "//apple/internal/utils:clang_rt_dylibs",
         "//apple/internal/utils:main_thread_checker_dylibs",
         "@bazel_skylib//lib:sets",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_apple_support//lib:apple_support",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 
@@ -780,8 +780,8 @@ bzl_library(
         "//apple/internal/utils:clang_rt_dylibs",
         "//apple/internal/utils:main_thread_checker_dylibs",
         "@bazel_skylib//lib:sets",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
         "@build_bazel_apple_support//lib:apple_support",
+        "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )
 

apple/internal/apple_framework_import.bzl

@@ -30,12 +30,12 @@ load(
     "@bazel_skylib//lib:sets.bzl",
     "sets",
 )
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "swift_clang_module_aspect",
     "swift_common",
 )
+load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
@@ -172,7 +172,7 @@ def _apple_dynamic_framework_import_impl(ctx):
     """Implementation for the apple_dynamic_framework_import rule."""
     actions = ctx.actions
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     deps = ctx.attr.deps
     disabled_features = ctx.disabled_features
     features = ctx.features
@@ -288,7 +288,7 @@ def _apple_static_framework_import_impl(ctx):
     """Implementation for the apple_static_framework_import rule."""
     actions = ctx.actions
     alwayslink = ctx.attr.alwayslink or getattr(ctx.fragments.objc, "alwayslink_by_default", False)
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     compilation_mode = ctx.var["COMPILATION_MODE"]
     deps = ctx.attr.deps
     disabled_features = ctx.disabled_features
@@ -467,7 +467,7 @@ to manually dlopen the framework at runtime.
 """,
             ),
             "_cc_toolchain": attr.label(
-                default = "@bazel_tools//tools/cpp:current_cc_toolchain",
+                default = "@rules_cc//cc:current_cc_toolchain",
                 doc = "The C++ toolchain to use.",
             ),
         },
@@ -493,7 +493,7 @@ objc_library(
 )
 ```
 """,
-    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cc_toolchain(),
 )
 
 apple_static_framework_import = rule(
@@ -572,12 +572,12 @@ not include Swift interface or Swift module files.
                 default = False,
             ),
             "_cc_toolchain": attr.label(
-                default = "@bazel_tools//tools/cpp:current_cc_toolchain",
+                default = "@rules_cc//cc:current_cc_toolchain",
                 doc = "The C++ toolchain to use.",
             ),
         },
     ),
-    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cc_toolchain(),
     doc = """
 This rule encapsulates an already-built static framework. It is defined by a list of
 files in exactly one `.framework` directory. `apple_static_framework_import` targets

apple/internal/apple_xcframework_import.bzl

@@ -16,13 +16,13 @@
 
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_skylib//lib:paths.bzl", "paths")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
 load("@build_bazel_apple_support//lib:apple_support.bzl", "apple_support")
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "swift_clang_module_aspect",
     "swift_common",
 )
+load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//apple:providers.bzl", "AppleFrameworkImportInfo")
 load(
@@ -482,7 +482,7 @@ def _apple_dynamic_xcframework_import_impl(ctx):
     apple_fragment = ctx.fragments.apple
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     deps = ctx.attr.deps
     disabled_features = ctx.disabled_features
     features = ctx.features
@@ -594,7 +594,7 @@ def _apple_static_xcframework_import_impl(ctx):
     apple_fragment = ctx.fragments.apple
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     deps = ctx.attr.deps
     disabled_features = ctx.disabled_features
     features = ctx.features
@@ -786,7 +786,7 @@ Unnecssary and ignored, will be removed in the future.
 """,
             ),
             "_cc_toolchain": attr.label(
-                default = "@bazel_tools//tools/cpp:current_cc_toolchain",
+                default = "@rules_cc//cc:current_cc_toolchain",
                 doc = "The C++ toolchain to use.",
             ),
         },
@@ -797,7 +797,7 @@ Unnecssary and ignored, will be removed in the future.
         CcInfo,
         AppleDynamicFrameworkInfo,
     ],
-    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cc_toolchain(),
 )
 
 apple_static_xcframework_import = rule(
@@ -921,11 +921,11 @@ Unnecssary and ignored, will be removed in the future.
 """,
             ),
             "_cc_toolchain": attr.label(
-                default = "@bazel_tools//tools/cpp:current_cc_toolchain",
+                default = "@rules_cc//cc:current_cc_toolchain",
                 doc = "The C++ toolchain to use.",
             ),
         },
     ),
     fragments = ["apple", "cpp", "objc"],
-    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cc_toolchain(),
 )

apple/internal/ios_rules.bzl

@@ -15,12 +15,12 @@
 """Implementation of iOS rules."""
 
 load("@bazel_skylib//lib:collections.bzl", "collections")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load(
     "@build_bazel_apple_support//lib:apple_support.bzl",
     "apple_support",
 )
 load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo")
+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_info.bzl", "CcInfo")
 load(
@@ -894,7 +894,7 @@ def _ios_framework_impl(ctx):
         bundle_name = bundle_name,
         suffix_default = ctx.attr._bundle_id_suffix_default,
     )
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,
@@ -1480,7 +1480,7 @@ def _ios_dynamic_framework_impl(ctx):
         rule_descriptor = rule_descriptor,
     )
     executable_name = ctx.attr.executable_name
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,

apple/internal/macos_rules.bzl

@@ -14,7 +14,6 @@
 
 """Implementation of macOS rules."""
 
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load(
     "@build_bazel_apple_support//lib:apple_support.bzl",
     "apple_support",
@@ -23,6 +22,7 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+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_info.bzl", "CcInfo")
 load(
@@ -2792,7 +2792,7 @@ def _macos_framework_impl(ctx):
         rule_descriptor = rule_descriptor,
     )
     executable_name = ctx.attr.executable_name
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,
@@ -3068,7 +3068,7 @@ def _macos_dynamic_framework_impl(ctx):
         rule_descriptor = rule_descriptor,
     )
     executable_name = ctx.attr.executable_name
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,

apple/internal/rule_attrs.bzl

@@ -179,7 +179,7 @@ def _binary_linking_attrs(
         # See utils/clang_rt_dylibs.bzl and partials/clang_rt_dylibs.bzl
         extra_attrs = dicts.add(extra_attrs, {
             "_cc_toolchain": attr.label(
-                default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
+                default = Label("@rules_cc//cc:current_cc_toolchain"),
             ),
         })
 

apple/internal/rule_factory.bzl

@@ -18,7 +18,7 @@ load(
     "@bazel_skylib//lib:dicts.bzl",
     "dicts",
 )
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "use_cpp_toolchain")
+load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
 load(
     "//apple:providers.bzl",
     "AppleBundleInfo",
@@ -115,7 +115,7 @@ def _create_apple_rule(
         implementation,
         is_executable = False,
         predeclared_outputs = {},
-        toolchains = use_cpp_toolchain(),
+        toolchains = use_cc_toolchain(),
         attrs):
     """Creates an Apple bundling rule with additional control of the set of rule attributes.
 

apple/internal/tvos_rules.bzl

@@ -14,7 +14,6 @@
 
 """Implementation of tvOS rules."""
 
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load(
     "@build_bazel_apple_support//lib:apple_support.bzl",
     "apple_support",
@@ -23,6 +22,7 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+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_info.bzl", "CcInfo")
 load(
@@ -501,7 +501,7 @@ def _tvos_dynamic_framework_impl(ctx):
         rule_descriptor = rule_descriptor,
     )
     executable_name = ctx.attr.executable_name
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,
@@ -793,7 +793,7 @@ def _tvos_framework_impl(ctx):
         bundle_name = bundle_name,
         suffix_default = ctx.attr._bundle_id_suffix_default,
     )
-    cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain = find_cc_toolchain(ctx)
     cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,