Skip to content

Commit 9df8482

Browse files
arrdemmalt3aspect-marvin
authored
fix(bazel9): CcInfo needs to come from rules_cc (#746)
- Fix from @malt3 - Mod the MODULE file and include as needed - pre-commit will finish Fixes #731. ### Changes are visible to end-users: yes - Searched for relevant documentation and updated as needed: yes - Breaking change (forces users to change their own code or config): no - Suggested release notes appear below: yes [Bazel 9] Now depends on `rules_cc` for required `CcInfo`. ### Test plan - Covered by existing tests - Manually exercised locally first --------- Co-authored-by: Malte Poll <[email protected]> Co-authored-by: aspect-marvin[bot] <[email protected]>
1 parent 1d9b656 commit 9df8482

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

MODULE.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ bazel_dep(name = "bazel_skylib", version = "1.4.2")
1313
bazel_dep(name = "platforms", version = "1.0.0")
1414
bazel_dep(name = "rules_python", version = "1.0.0")
1515
bazel_dep(name = "with_cfg.bzl", version = "0.11.0")
16+
bazel_dep(name = "rules_cc", version = "0.2.11")
1617

1718
tools = use_extension("//py:extensions.bzl", "py_tools")
1819
tools.rules_py_tools()
@@ -79,8 +80,6 @@ use_repo(tel, "aspect_tools_telemetry_report")
7980
# LLVM configuration
8081

8182
bazel_dep(name = "toolchains_llvm", version = "1.4.0")
82-
bazel_dep(name = "rules_cc", version = "0.2.11")
83-
8483
single_version_override(
8584
module_name = "toolchains_llvm",
8685
patch_strip = 1,

bazel/include/llvm.MODULE.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# LLVM configuration
22

33
bazel_dep(name = "toolchains_llvm", version = "1.4.0")
4-
bazel_dep(name = "rules_cc", version = "0.2.11")
5-
64
single_version_override(
75
module_name = "toolchains_llvm",
86
patch_strip = 1,

py/private/py_library.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ without binding them to a particular version of that package.
66

77
load("@bazel_skylib//lib:new_sets.bzl", "sets")
88
load("@bazel_skylib//lib:paths.bzl", "paths")
9+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
910
load("@rules_python//python:defs.bzl", "PyInfo")
1011
load("//py/private:providers.bzl", "PyVirtualInfo")
1112

0 commit comments

Comments
 (0)