Modernize bazel config

keith · poletti-marco · commit 092cea3f1408 · 2026-04-11T17:10:49.000-07:00
This makes this repo build with bzlmod. It also removes the empty linking context produced by `generate_fruit_config`. This works inside google but not with bazel. It also shouldn't be necessary since all this is doing is trying to propagate a header. Fixes bazelbuild/bazel#23488
diff --git a/BUILD b/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 licenses(["notice"])
@@ -18,10 +19,13 @@ cc_library(
         "include/fruit/impl/**/*.h",
         ]),
     hdrs = glob(["include/fruit/*.h"]),
-    includes = ["include", "configuration/bazel"],
+    includes = [
+        "configuration/bazel",
+        "include",
+    ],
+    linkopts = ["-lm"],
     deps = [
-        "@boost//:unordered",
         "//third_party/fruit/configuration/bazel:fruit-config-base",
+        "@boost.unordered",
     ],
-    linkopts = ["-lm"],
 )
diff --git a/configuration/bazel/build_defs.bzl b/configuration/bazel/build_defs.bzl
@@ -1,5 +1,7 @@
 load("@rules_cc//cc:action_names.bzl", "C_COMPILE_ACTION_NAME")
 load("@rules_cc//cc: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")
 
 def _generate_fruit_config_impl(ctx):
     cc_toolchain = find_cpp_toolchain(ctx)
@@ -71,25 +73,9 @@ def _generate_fruit_config_impl(ctx):
         outputs = [merged_output_file],
     )
 
-    compilation_context, compilation_outputs = cc_common.compile(
-        actions = ctx.actions,
-        feature_configuration = feature_configuration,
-        cc_toolchain = cc_toolchain,
-        public_hdrs = [merged_output_file],
-        name = "%s_link" % ctx.label.name,
-    )
-
-    linking_context, linking_outputs = cc_common.create_linking_context_from_compilation_outputs(
-        actions = ctx.actions,
-        feature_configuration = feature_configuration,
-        compilation_outputs = compilation_outputs,
-        cc_toolchain = cc_toolchain,
-        name = "%s_link" % ctx.label.name,
-    )
-
     return [
         DefaultInfo(files = depset([merged_output_file]), runfiles = ctx.runfiles(files = [merged_output_file])),
-        CcInfo(compilation_context=compilation_context, linking_context=linking_context),
+        CcInfo(compilation_context = cc_common.create_compilation_context(headers = depset([merged_output_file]))),
     ]
 
 generate_fruit_config = rule(
@@ -100,4 +86,4 @@ generate_fruit_config = rule(
     },
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
     fragments = ["cpp"],
-)
+)
diff --git a/examples/annotated_injection/BUILD b/examples/annotated_injection/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 licenses(["notice"])
 
diff --git a/examples/hello_world/BUILD b/examples/hello_world/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 licenses(["notice"])
 
diff --git a/examples/multibindings/BUILD b/examples/multibindings/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 licenses(["notice"])
 
diff --git a/examples/scaling_doubles/BUILD b/examples/scaling_doubles/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 licenses(["notice"])
 
diff --git a/examples/server/BUILD b/examples/server/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 licenses(["notice"])
 
diff --git a/examples/simple_injection/BUILD b/examples/simple_injection/BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 licenses(["notice"])
 
diff --git a/examples/testing/BUILD b/examples/testing/BUILD
@@ -1,3 +1,6 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 licenses(["notice"])
 
diff --git a/extras/bazel_root/MODULE.bazel b/extras/bazel_root/MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+    name = "fruit",
+    version = "0",
+)
+
+bazel_dep(name = "boost.unordered", version = "1.90.0.bcr.1")
+bazel_dep(name = "rules_cc", version = "0.2.17")
+bazel_dep(name = "rules_python", version = "1.0.0")
+
+bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True, repo_name = "com_google_googletest")
diff --git a/extras/bazel_root/WORKSPACE b/extras/bazel_root/WORKSPACE
diff --git a/extras/bazel_usage_example/BUILD b/extras/bazel_usage_example/BUILD
@@ -1,8 +1,9 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 licenses(["notice"])
 
 cc_binary(
     name = "hello_world",
     srcs = ["main.cpp"],
-    deps = ["@com_google_fruit//third_party/fruit"],
+    deps = ["@fruit//third_party/fruit"],
 )
diff --git a/extras/bazel_usage_example/MODULE.bazel b/extras/bazel_usage_example/MODULE.bazel
@@ -0,0 +1,7 @@
+bazel_dep(name = "fruit")
+local_path_override(
+    module_name = "fruit",
+    path = "../bazel_root",
+)
+
+bazel_dep(name = "rules_cc", version = "0.2.17")
diff --git a/extras/bazel_usage_example/WORKSPACE b/extras/bazel_usage_example/WORKSPACE
diff --git a/tests/BUILD b/tests/BUILD
@@ -1,3 +1,7 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+load("@rules_python//python:defs.bzl", "py_library")
+load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
 
 licenses(["notice"])
 
@@ -21,8 +25,8 @@ cc_library(
     includes = ["."],
     deps = [
         "//third_party/fruit",
-        "@boost//:unordered",
-    ]
+        "@boost.unordered",
+    ],
 )
 
 [cc_test(
@@ -31,10 +35,15 @@ cc_library(
     deps = [
         ":test_headers",
         "//third_party/fruit",
-    ]
+    ],
 ) for filename in glob(
     ["*.cpp"],
-    exclude = ["include_test.cpp", "test_common.cpp"])]
+    allow_empty = True,
+    exclude = [
+        "include_test.cpp",
+        "test_common.cpp",
+    ],
+)]
 
 FRUIT_PUBLIC_HEADERS = [
     "component",
@@ -102,8 +111,6 @@ py_library(
     visibility = ["//third_party/fruit/tests:__subpackages__"],
 )
 
-load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
-
 fruit_py_tests(
     srcs = glob(["test_*.py"]),
 )
diff --git a/tests/build_defs.bzl b/tests/build_defs.bzl
@@ -1,7 +1,8 @@
+load("@rules_python//python:defs.bzl", "py_test")
 
-def fruit_py_tests(srcs, data=[]):
+def fruit_py_tests(srcs, data = []):
     for filename in srcs:
-        native.py_test(
+        py_test(
             name = filename[:-3],
             srcs = [filename],
             imports = ["."],
diff --git a/tests/data_structures/BUILD b/tests/data_structures/BUILD
@@ -1,8 +1,7 @@
+load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
 
 licenses(["notice"])
 
-load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
-
 fruit_py_tests(
     srcs = glob(["test_*.py"]),
 )
diff --git a/tests/meta/BUILD b/tests/meta/BUILD
@@ -1,8 +1,7 @@
+load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
 
 licenses(["notice"])
 
-load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
-
 filegroup(
     name = "additional_test_headers_filegroup",
     srcs = ["common.h"],
diff --git a/tests/util/BUILD b/tests/util/BUILD
@@ -1,9 +1,7 @@
+load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
 
 licenses(["notice"])
 
-load("//third_party/fruit/tests:build_defs.bzl", "fruit_py_tests")
-
 fruit_py_tests(
     srcs = glob(["test_*.py"]),
 )
-

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")`
`1`	`2`
`2`	`3`	`licenses(["notice"])`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")`
	`2`	`+load("@rules_cc//cc:cc_library.bzl", "cc_library")`
`1`	`3`
`2`	`4`	`licenses(["notice"])`
`3`	`5`