fixes

Author: alexeagle

.bazelrc

@@ -4,6 +4,7 @@ common --config=ruleset
 
 # Don't build protoc from the cc_binary, it's slow and spammy when cache miss
 common --incompatible_enable_proto_toolchain_resolution
+common --@protobuf//bazel/toolchains:prefer_prebuilt_protoc
 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
 

.bcr/patches/go_dev_deps.patch

@@ -1,11 +1,5 @@
 --- a/MODULE.bazel
 +++ b/MODULE.bazel
-@@ -34,7 +34,7 @@ use_repo(multitool, "multitool")
- 
- # To allow /tools to be built from source
- # NOTE: when publishing to BCR, we patch this to be True, as we publish pre-built binaries with our releases.
+@@ -9,1 +9,1 @@
 -IS_RELEASE = False
 +IS_RELEASE = True
- 
- bazel_dep(
-     name = "toolchains_protoc",

MODULE.bazel

@@ -6,6 +6,9 @@ module(
     compatibility_level = 1,
 )
 
+# NOTE: when publishing to BCR, we patch this to be True, as we publish pre-built binaries with our releases.
+IS_RELEASE = False
+
 # We don't actually depend directly on aspect_bazel_lib, but we do require this
 # version be used transitively so that it doesn't produce conflicting actions
 # with the bazel_lib module we use.
@@ -58,22 +61,11 @@ use_repo(rules_lint_toolchains, "sarif_parser_toolchains")
 register_toolchains("@sarif_parser_toolchains//:all")
 
 ####### Dev dependencies ########
-
-bazel_dep(name = "bazelrc-preset.bzl", version = "1.1.0", dev_dependency = True)
-
 # To allow /tools to be built from source
-# NOTE: when publishing to BCR, we patch this to be True, as we publish pre-built binaries with our releases.
-IS_RELEASE = False
-
-bazel_dep(
-    name = "toolchains_protoc",
-    version = "0.6.0",
-    dev_dependency = IS_RELEASE,
-)
 
-protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc", dev_dependency = IS_RELEASE)
-protoc.toolchain(version = "v32.0")
+bazel_dep(name = "bazelrc-preset.bzl", version = "1.1.0", dev_dependency = True)
 
+bazel_dep(name = "protobuf", version = "33.4", dev_dependency = IS_RELEASE)
 bazel_dep(
     name = "gazelle",
     version = "0.43.0",