[NO TESTS] WIP

Author: arrdem

.bazelrc

@@ -12,8 +12,13 @@ build --define=SOME_VAR=SOME_VALUE
 
 common --features=-libtool
 common --incompatible_enable_cc_toolchain_resolution
+
+# Use prebuilt protoc
+common --incompatible_enable_proto_toolchain_resolution
 common --per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
 common --host_per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --per_file_copt=external/.*grpc.*@--GRPC_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --host_per_file_copt=external/.*grpc.*@--GRPC_WAS_NOT_SUPPOSED_TO_BE_BUILT
 
 # Use local rules_python
 # Enable with --config=dev

MODULE.bazel

@@ -24,6 +24,7 @@ bazel_dep(name = "rules_python", version = "1.0.0")
 bazel_dep(name = "rules_python_gazelle_plugin", version = "1.0.0", dev_dependency = True)
 bazel_dep(name = "toolchains_musl", version = "0.1.20", dev_dependency = True)
 bazel_dep(name = "toolchains_llvm", version = "1.4.0", dev_dependency = True)
+bazel_dep(name = "toolchains_protoc", version = "0.4.3", dev_dependency = True)
 
 single_version_override(
     module_name = "rules_python",
@@ -34,19 +35,15 @@ single_version_override(
     version = "1.0.0",
 )
 
-# single_version_override(
-#     module_name = "toolchains_llvm",
-#     version = "0.10.3",
-#     patches = [
-#         "//third_party/com.github/bazel-contrib/toolchains_llvm:clang_ldd.patch",
-#     ],
-# )
-
 bazel_lib = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains")
 bazel_lib.expand_template()
 bazel_lib.tar()
 use_repo(bazel_lib, "bsd_tar_toolchains")
 
+protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
+use_repo(protoc, "toolchains_protoc_hub")
+register_toolchains("@toolchains_protoc_hub//:all")
+
 # Custom python version for testing only
 python = use_extension("@rules_python//python/extensions:python.bzl", "python", dev_dependency = True)
 python.toolchain(

tools/release/fetch.bzl

@@ -2,20 +2,39 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+SYSROOT_LINUX_BUILD_FILE = """
+filegroup(
+    name = "sysroot",
+    srcs = glob(["*/**"]),
+    visibility = ["//visibility:public"],
+)
+"""
+
+SYSROOT_DARWIN_BUILD_FILE = """
+filegroup(
+    name = "sysroot",
+    srcs = glob(
+        include = ["**"],
+        exclude = ["**/*:*"],
+    ),
+    visibility = ["//visibility:public"],
+)
+"""
+
 def _release_tools_impl(_module_ctx):
     """Fetch dependencies only needed for release builds used for the legacy WORKSPACE support."""
 
     # FIXME: Replace this with the BCR release
     http_archive(
         name = "org_chromium_sysroot_linux_arm64",
-        build_file_content = _SYSROOT_LINUX_BUILD_FILE,
+        build_file_content = SYSROOT_LINUX_BUILD_FILE,
         sha256 = "b199942a0bd9c34800e8d7b669778ef45f2054b9f106039439383dd66efcef31",
         urls = ["https://github.com/DavidZbarsky-at/sysroot-min/releases/download/v0.0.20/debian_bullseye_arm64_sysroot.tar.xz"],
     )
 
     http_archive(
         name = "org_chromium_sysroot_linux_x86_64",
-        build_file_content = _SYSROOT_LINUX_BUILD_FILE,
+        build_file_content = SYSROOT_LINUX_BUILD_FILE,
         sha256 = "b279dd2926e7d3860bb4e134997a45df5106f680e160a959b945580ba4ec755f",
         urls = ["https://github.com/DavidZbarsky-at/sysroot-min/releases/download/v0.0.20/debian_bullseye_amd64_sysroot.tar.xz"],
     )
@@ -28,7 +47,7 @@ def _release_tools_impl(_module_ctx):
 
     http_archive(
         name = "sysroot_darwin_universal",
-        build_file_content = _SYSROOT_DARWIN_BUILD_FILE,
+        build_file_content = SYSROOT_DARWIN_BUILD_FILE,
         sha256 = "11870a4a3d382b78349861081264921bb883440a7e0b3dd4a007373d87324a38",
         strip_prefix = "sdk-macos-11.3-ccbaae84cc39469a6792108b24480a4806e09d59/root",
         urls = ["https://github.com/hexops-graveyard/sdk-macos-11.3/archive/ccbaae84cc39469a6792108b24480a4806e09d59.tar.gz"],