fix: import rules_cc components explicitly (#423)

wep21 · web-flow · commit 3692ecb47fc9 · 2026-01-15T22:21:19.000+08:00
* fix: import CcInfo explicitly
* update workspace
* add bazel 9
* fix test
* fix docs
* write about loading rules_cc into readme
* use latest rc
* remove bazel 6.5 due to eol

Signed-off-by: wep21 &lt;daisuke.nishimatsu1021@gmail.com&gt;
diff --git a/.github/release_notes.template b/.github/release_notes.template
@@ -1,6 +1,16 @@
 ## `WORKSPACE` code
 ```starlark
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_cc",
+    sha256 = "{rules_cc_sha256}",
+    strip_prefix = "rules_cc-{rules_cc_version}",
+    urls = ["https://github.com/bazelbuild/rules_cc/releases/download/{rules_cc_version}/rules_cc-{rules_cc_version}.tar.gz"],
+)
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+compatibility_proxy_repo()
+
 http_archive(
     name = "rules_cuda",
     sha256 = "{archive_sha256}",
diff --git a/.github/workflows/utilities-tests.yaml b/.github/workflows/utilities-tests.yaml
@@ -19,9 +19,9 @@ jobs:
         bazel-version:
           # NOTE: read from .bazelversion so that we don't randomly break our
           # ci due to latest bazel version change
+          - 9.0.0rc5
           - .bazelversion
           - 7.5.0
-          - 6.5.0
     env:
       USE_BAZEL_VERSION: ${{ matrix.bazel-version }}
     steps:
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,6 +6,7 @@ module(
 
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
 bazel_dep(name = "platforms", version = "0.0.6")
+bazel_dep(name = "rules_cc", version = "0.2.14")
 
 cuda = use_extension("@rules_cuda//cuda:extensions.bzl", "toolchain")
 cuda.toolkit(
diff --git a/README.md b/README.md
@@ -12,6 +12,16 @@ Add the following to your `WORKSPACE` file and replace the placeholders with act
 
 ```starlark
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_cc",
+    sha256 = "{rules_cc_sha256}",
+    strip_prefix = "rules_cc-{rules_cc_version}",
+    urls = ["https://github.com/bazelbuild/rules_cc/releases/download/{rules_cc_version}/rules_cc-{rules_cc_version}.tar.gz"],
+)
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+compatibility_proxy_repo()
+
 http_archive(
     name = "rules_cuda",
     sha256 = "{sha256_to_replace}",
@@ -23,6 +33,8 @@ rules_cuda_dependencies()
 rules_cuda_toolchains(register_toolchains = True)
 ```
 
+`rules_cc` needs to be available before loading `rules_cuda`, and `compatibility_proxy_repo()` must be called to populate the compatibility repository that `rules_cc` expects.
+
 **NOTE**: `rules_cuda_toolchains` implicitly calls to `register_detected_cuda_toolchains`, and the use of
 `register_detected_cuda_toolchains` depends on the environment variable `CUDA_PATH`. You must also ensure the
 host compiler is available. On Windows, this means that you will also need to set the environment variable
@@ -37,6 +49,7 @@ determains how the toolchains are detected.
 Add the following to your `MODULE.bazel` file and replace the placeholders with actual values.
 
 ```starlark
+bazel_dep(name = "rules_cc", version = "{rules_cc_version}")
 bazel_dep(name = "rules_cuda", version = "0.2.1")
 
 # pick a specific version (this is optional an can be skipped)
@@ -55,6 +68,8 @@ cuda.toolkit(
 use_repo(cuda, "cuda")
 ```
 
+`rules_cc` provides the C++ toolchain dependency for `rules_cuda`; in Bzlmod the compatibility repository is handled by `rules_cc` itself.
+
 ### Rules
 
 - `cuda_library`: Can be used to compile and create static library for CUDA kernel code. The resulting targets can be
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -5,6 +5,30 @@ local_repository(
     path = "examples",
 )
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "bazel_features",
+    sha256 = "5ab1a90d09fd74555e0df22809ad589627ddff263cff82535815aa80ca3e3562",
+    strip_prefix = "bazel_features-1.39.0",
+    url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.39.0/bazel_features-v1.39.0.tar.gz",
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+http_archive(
+    name = "rules_cc",
+    sha256 = "a2fdfde2ab9b2176bd6a33afca14458039023edb1dd2e73e6823810809df4027",
+    strip_prefix = "rules_cc-0.2.14",
+    url = "https://github.com/bazelbuild/rules_cc/releases/download/0.2.14/rules_cc-0.2.14.tar.gz",
+)
+
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+
+compatibility_proxy_repo()
+
 load("@rules_cuda//cuda:repositories.bzl", "rules_cuda_dependencies", "rules_cuda_toolchains")
 
 rules_cuda_dependencies()
diff --git a/cuda/dummy/BUILD.bazel b/cuda/dummy/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_binary(
diff --git a/cuda/private/actions/compile.bzl b/cuda/private/actions/compile.bzl
@@ -1,4 +1,5 @@
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:cuda_helper.bzl", "cuda_helper")
 load("//cuda/private:rules/common.bzl", "ALLOW_CUDA_SRCS")
diff --git a/cuda/private/actions/dlink.bzl b/cuda/private/actions/dlink.bzl
@@ -1,6 +1,7 @@
 ""
 
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:actions/compile.bzl", "compile")
 load("//cuda/private:cuda_helper.bzl", "cuda_helper")
diff --git a/cuda/private/cuda_helper.bzl b/cuda/private/cuda_helper.bzl
@@ -5,6 +5,8 @@ load("@bazel_skylib//lib:types.bzl", "types")
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES")
 load("//cuda/private:providers.bzl", "ArchSpecInfo", "CudaArchsInfo", "CudaInfo", "Stage2ArchInfo", "cuda_archs")
diff --git a/cuda/private/macros/cuda_binary.bzl b/cuda/private/macros/cuda_binary.bzl
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//cuda/private:rules/cuda_library.bzl", _cuda_library = "cuda_library")
 
 def cuda_binary(name, **attrs):
@@ -43,7 +44,7 @@ def cuda_binary(name, **attrs):
         if src in cc_attrs:
             cc_attrs[dst] = cc_attrs.pop(src)
 
-    native.cc_binary(
+    cc_binary(
         name = name,
         deps = [cuda_library_name],
         **cc_attrs
diff --git a/cuda/private/os_helpers.bzl b/cuda/private/os_helpers.bzl
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 def if_linux(if_true, if_false = []):
     return select({
         "@platforms//os:linux": if_true,
@@ -25,7 +27,7 @@ def cc_import_versioned_sos(name, shared_library):
     # NOTE: only empty when the componnent is not installed on the system, say, cublas is not installed with apt-get
     so_paths = native.glob([shared_library + "*"], allow_empty = True)
 
-    native.cc_library(
+    cc_library(
         name = name,
         srcs = so_paths,
         target_compatible_with = ["@platforms//os:linux"],
diff --git a/cuda/private/rules/cuda_library.bzl b/cuda/private/rules/cuda_library.bzl
@@ -1,4 +1,6 @@
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//cuda/private:actions/compile.bzl", "compile")
 load("//cuda/private:actions/dlink.bzl", "device_link")
 load("//cuda/private:cuda_helper.bzl", "cuda_helper")
diff --git a/cuda/private/rules/cuda_objects.bzl b/cuda/private/rules/cuda_objects.bzl
@@ -1,4 +1,5 @@
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//cuda/private:actions/compile.bzl", "compile")
 load("//cuda/private:cuda_helper.bzl", "cuda_helper")
 load("//cuda/private:providers.bzl", "CudaInfo")
diff --git a/cuda/private/templates/BUILD.cuda_shared b/cuda/private/templates/BUILD.cuda_shared
@@ -1,5 +1,6 @@
 load("@bazel_skylib//rules:common_settings.bzl", "bool_setting")  # @unused
 load("@cuda//:defs.bzl", "additional_header_deps", "if_cuda_toolkit_version_ge", "if_local_cuda_toolkit")  # @unused
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_import", "cc_library")
 load("@rules_cuda//cuda:defs.bzl", "cc_import_versioned_sos", "if_linux", "if_windows")  # @unused
 
 package(
diff --git a/cuda/private/toolchain.bzl b/cuda/private/toolchain.bzl
@@ -1,5 +1,6 @@
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo")
 load("//cuda/private:toolchain_config_lib.bzl", "config_helper")
 
diff --git a/cuda/private/toolchain_configs/nvcc.bzl b/cuda/private/toolchain_configs/nvcc.bzl
@@ -1,6 +1,7 @@
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES")
 load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo")
diff --git a/cuda/private/toolchain_configs/nvcc_msvc.bzl b/cuda/private/toolchain_configs/nvcc_msvc.bzl
@@ -1,6 +1,7 @@
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES")
 load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo")
diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
@@ -7,6 +7,8 @@ bzl_library(
     deps = [
         # NOTE: workaround for https://github.com/bazelbuild/rules_cc/issues/279
         # see https://github.com/bazel-contrib/rules_go/issues/4394#issuecomment-3063983207
+        "@rules_cc//cc:core_rules",
+        "@rules_cc//cc:defs_bzl",
         "@rules_cc//cc:cc_toolchain_config_lib.bzl",
         "@rules_cc//cc:find_cc_toolchain_bzl",
         "@rules_cc//cc/common",
diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
@@ -22,3 +22,4 @@ use_repo(cuda, "cuda")
 #################################
 # See WORKSPACE.bzlmod for the remaining parts
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "rules_cc", version = "0.2.14")
diff --git a/examples/basic/BUILD.bazel b/examples/basic/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("@rules_cuda//cuda:defs.bzl", "cuda_library")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/examples/cublas/BUILD.bazel b/examples/cublas/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+
 # Run with 'bazel run //examples/cublas:main'
 cc_binary(
     name = "main",
diff --git a/examples/if_cuda/BUILD.bazel b/examples/if_cuda/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("@rules_cuda//cuda:defs.bzl", "cuda_library", "requires_cuda")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/tests/flag/testonly_toolchains/config_sysroot_test_toolchain.bzl b/tests/flag/testonly_toolchains/config_sysroot_test_toolchain.bzl
@@ -1,4 +1,7 @@
 load("@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl", "tool_path")
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
 
 def _impl(ctx):
     return cc_common.create_cc_toolchain_config_info(
@@ -54,7 +57,7 @@ def config_sysroot_test_toolchain(identifier, sysroot):
         **optional_sysroot
     )
 
-    native.cc_toolchain(
+    cc_toolchain(
         name = cc_toolchain_name,
         all_files = ":empty",
         compiler_files = ":empty",
diff --git a/tests/integration/BUILD.to_symlink b/tests/integration/BUILD.to_symlink
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 load("@rules_cuda//cuda:defs.bzl", "cuda_library", "requires_cuda")
 
 cc_library(
diff --git a/tests/integration/toolchain_components/MODULE.bazel b/tests/integration/toolchain_components/MODULE.bazel
@@ -1,5 +1,6 @@
 module(name = "bzlmod_components")
 
+bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_cuda", version = "0.0.0")
 local_path_override(
     module_name = "rules_cuda",
diff --git a/tests/integration/toolchain_none/MODULE.bazel b/tests/integration/toolchain_none/MODULE.bazel
@@ -1,5 +1,6 @@
 module(name = "toolchain_none")
 
+bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_cuda", version = "0.0.0")
 local_path_override(
     module_name = "rules_cuda",
diff --git a/tests/integration/toolchain_redist_json/MODULE.bazel b/tests/integration/toolchain_redist_json/MODULE.bazel
@@ -1,5 +1,6 @@
 module(name = "bzlmod_components")
 
+bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_cuda", version = "0.0.0")
 local_path_override(
     module_name = "rules_cuda",
diff --git a/tests/integration/toolchain_root/MODULE.bazel b/tests/integration/toolchain_root/MODULE.bazel
@@ -1,5 +1,6 @@
 module(name = "bzlmod_use_repo_no_toolchain")
 
+bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_cuda", version = "0.0.0")
 local_path_override(
     module_name = "rules_cuda",
diff --git a/tests/integration/toolchain_rules/MODULE.bazel b/tests/integration/toolchain_rules/MODULE.bazel
@@ -1,5 +1,6 @@
 module(name = "bzlmod_use_repo")
 
+bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_cuda", version = "0.0.0")
 local_path_override(
     module_name = "rules_cuda",
diff --git a/tests/utils/cc_import_versioned_sos/cc_import_versioned_sos_test.bzl b/tests/utils/cc_import_versioned_sos/cc_import_versioned_sos_test.bzl
@@ -1,4 +1,5 @@
 load("@bazel_skylib//lib:unittest.bzl", "analysistest")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//cuda/private:os_helpers.bzl", "cc_import_versioned_sos")
 
 def _library_basenames_test_impl(ctx):

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_cc//cc:defs.bzl", "cc_binary")`
	`2`	`+`
`1`	`3`	`package(default_visibility = ["//visibility:public"])`
`2`	`4`
`3`	`5`	`cc_binary(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")`
	`2`	`+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")`
`2`	`3`	`load("//cuda/private:action_names.bzl", "ACTION_NAMES")`
`3`	`4`	`load("//cuda/private:cuda_helper.bzl", "cuda_helper")`
`4`	`5`	`load("//cuda/private:rules/common.bzl", "ALLOW_CUDA_SRCS")`