Fixing coverage import and cc toolchains

bazelbuild · Sep 20, 2022 · 5612db8 · 5612db8
1 parent 19051e5
commit 5612db8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,3 +1 @@
 build:bzlmod --experimental_enable_bzlmod
-build:bzlmod --crosstool_top=@rules_cc.0.0.1.cc_configure.local_config_cc//:toolchain
-build:bzlmod --host_crosstool_top=@rules_cc.0.0.1.cc_configure.local_config_cc//:toolchain
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -9,3 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.0.1")
 bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "3.19.0")
 bazel_dep(name = "googletest", repo_name = "com_google_googletest", version = "1.11.0")
 bazel_dep(name = "rules_java", version = "5.1.0")
+
+# Importing non bzl-mod remote_coverage_tools
+coverage_deps_ext = use_extension("//proto/private:bzlmod_deps.bzl", "coverage_deps_ext")
+use_repo(coverage_deps_ext, "remote_coverage_tools")
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
@@ -1,7 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "remote_coverage_tools",
-    sha256 = "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
-    urls = ["https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"],
-)