Remove prebuilt toolchain

pcj · pcj · commit a6a3624d5e1f · 2025-09-15T20:34:30.000-06:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -61,50 +61,6 @@ http_archive(
     urls = ["https://github.com/protocolbuffers/protobuf-javascript/archive/861c8020a5c0cba9b7cdf915dffde96a4421a1f4.tar.gz"],
 )
 
-[
-    http_archive(
-        name = "prebuilt_protoc-" + asset["arch"],
-        build_file_content = """
-filegroup(
-    name = "protoc",
-    srcs = ["bin/protoc%s"],
-    visibility = ["//visibility:public"],
-)
-    """ % asset["extension"],
-        sha256 = asset["sha256"],
-        urls = ["https://github.com/google/protobuf/releases/download/v{version}/protoc-{version}-{arch}.zip".format(
-            arch = asset["arch"],
-            version = asset["version"],
-        )],
-    )
-    for asset in [
-        {
-            "arch": "linux-x86_64",
-            "sha256": "7ca037bfe5e5cabd4255ccd21dd265f79eb82d3c010117994f5dc81d2140ee88",
-            "version": PROTOBUF_VERSION,
-            "extension": "",
-        },
-        {
-            "arch": "osx-x86_64",
-            "sha256": "b4f36b18202d54d343a66eebc9f8ae60809a2a96cc2d1b378137550bbe4cf33c",
-            "version": PROTOBUF_VERSION,
-            "extension": "",
-        },
-        {
-            "arch": "osx-aarch_64",
-            "sha256": "09a2c729cc821215cc0d4c564b761760961fe338c52f24b302fd7e18e7b675d1",
-            "version": PROTOBUF_VERSION,
-            "extension": "",
-        },
-        {
-            "arch": "win64",
-            "sha256": "89c178e9f878cb6dd561f677688e1eb2e757cb9ac84ae30b64436bac19646996",
-            "version": PROTOBUF_VERSION,
-            "extension": ".exe",
-        },
-    ]
-]
-
 http_archive(
     name = "com_github_grpc_grpc_node_packages_grpc_tools_src",
     build_file_content = """
diff --git a/docs/TOOLCHAINS.md b/docs/TOOLCHAINS.md
@@ -1,11 +1,11 @@
 # Toolchains
 
-Choose from either building protoc from source, or a prebuilt version.
+The standard toolchain uses `@com_google_protobuf//:protoc`:
 
 ```py
 register_toolchains("@build_stack_rules_proto//toolchain:standard")
 ```
 
-```py
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
-```
+To define an alternative, prepare a toolchain of type
+`@build_stack_rules_proto//toolchain:protoc` and register that instead. See
+[//toolchain:BUILD.bazel](/toolchain/BUILD.bazel) for an example.
diff --git a/docs/commonjs.md b/docs/commonjs.md
@@ -80,7 +80,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/cpp.md b/docs/cpp.md
@@ -82,7 +82,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/csharp.md b/docs/csharp.md
@@ -79,7 +79,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/go.md b/docs/go.md
@@ -93,7 +93,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/goembed.md b/docs/goembed.md
@@ -45,7 +45,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf")
 
diff --git a/docs/gomerge.md b/docs/gomerge.md
@@ -69,7 +69,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/java.md b/docs/java.md
@@ -80,7 +80,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/objc.md b/docs/objc.md
@@ -82,7 +82,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/proto_compiled_sources.md b/docs/proto_compiled_sources.md
@@ -65,7 +65,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf")
 
diff --git a/docs/proto_repository.md b/docs/proto_repository.md
@@ -94,7 +94,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
 
diff --git a/docs/python.md b/docs/python.md
@@ -79,7 +79,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/ruby.md b/docs/ruby.md
@@ -79,7 +79,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 ~~~
 
diff --git a/docs/scala.md b/docs/scala.md
@@ -103,77 +103,6 @@ proto_scala_library(
 ## `MODULE.bazel (snippet)`
 
 ~~~python
-# ----------------------------------------------------
-# scala
-# ----------------------------------------------------
-
-load("@build_stack_rules_proto//deps:scala_deps.bzl", "scala_deps")
-load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
-load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
-load(
-    "@rules_jvm_external//:defs.bzl",
-    "maven_install",
-)
-load("@build_stack_rules_proto//rules/proto:proto_repository.bzl", "proto_repository")
-
-scala_deps()
-
-scala_config(scala_version = "2.12.18")
-
-scala_repositories()
-
-scala_register_toolchains()
-
-# ----------------------------------------------------
-# maven
-# ----------------------------------------------------
-
-maven_install(
-    name = "maven_scala",
-    artifacts = [
-        "com.thesamet.scalapb:lenses_2.12:0.11.10",
-        "com.thesamet.scalapb:scalapb-json4s_2.12:0.12.0",
-        "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.10",
-        "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.11.10",
-        "com.thesamet.scalapb:scalapbc_2.12:0.11.10",
-        "org.json4s:json4s-core_2.12:4.0.3",
-    ],
-    fetch_sources = True,
-    repositories = ["https://repo1.maven.org/maven2"],
-)
-
-# ----------------------------------------------------
-# akka
-# ----------------------------------------------------
-
-maven_install(
-    name = "maven_akka",
-    artifacts = [
-        "com.lightbend.akka.grpc:akka-grpc-codegen_2.12:2.1.3",
-        "com.lightbend.akka.grpc:akka-grpc-runtime_2.12:2.1.3",
-    ],
-    fetch_sources = True,
-    repositories = ["https://repo1.maven.org/maven2"],
-)
-
-# ----------------------------------------------------
-# proto_repository
-# ----------------------------------------------------
-
-proto_repository(
-    name = "scalaapis",
-    build_directives = ["gazelle:proto_language scala enabled true"],
-    build_file_generation = "on",
-    build_file_proto_mode = "file",
-    cfgs = ["//:config.yaml"],
-    sha256 = "1ac039f79b0825fe2e7e5ddf24e330632d63b70a7a42bfd39ded5bb1fb648811",
-    # the typical importpath is 'scalapb/scalapb.proto', so strip the prefix up
-    # to that directory.
-    strip_prefix = "ScalaPB-a4e0e02c0f5b160877d5f97f6902dbec4c633afe/protobuf",
-    type = "zip",
-    urls = ["https://codeload.github.com/scalapb/ScalaPB/zip/a4e0e02c0f5b160877d5f97f6902dbec4c633afe"],
-)
 
 bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
 
@@ -188,7 +117,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
 bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf")
diff --git a/docs/starlark_java.md b/docs/starlark_java.md
@@ -67,11 +67,6 @@ proto_compile(
 ## `MODULE.bazel (snippet)`
 
 ~~~python
-# Using scala_deps here because it provides rules_jvm_external, there is nothing
-# scala-specific about this example.
-load("@build_stack_rules_proto//deps:scala_deps.bzl", "scala_deps")
-
-scala_deps()
 
 bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
 
@@ -86,7 +81,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf")
 
diff --git a/docs/strip_import_prefix.md b/docs/strip_import_prefix.md
@@ -74,7 +74,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 
 bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf")
 
diff --git a/example/golden/BUILD.bazel b/example/golden/BUILD.bazel
@@ -43,7 +43,7 @@ go_sdk.download(version = "1.23.1")
 # Configuration: protobuf
 # -------------------------------------------------------------------
 
-register_toolchains("@build_stack_rules_proto//toolchain:prebuilt")
+register_toolchains("@build_stack_rules_proto//toolchain:standard")
 """
 
 gazelle_testdata_example(
diff --git a/example/golden/testdata/commonjs/.bazelrc b/example/golden/testdata/commonjs/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
 build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/cpp/.bazelrc b/example/golden/testdata/cpp/.bazelrc
@@ -1 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/csharp/.bazelrc b/example/golden/testdata/csharp/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
-
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/go/.bazelrc b/example/golden/testdata/go/.bazelrc
@@ -1 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/goembed/.bazelrc b/example/golden/testdata/goembed/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
 build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/gomerge/.bazelrc b/example/golden/testdata/gomerge/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
-
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/imports_csv/.bazelrc b/example/golden/testdata/imports_csv/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
-
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/java/.bazelrc b/example/golden/testdata/java/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
 build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/mappingsmerge/.bazelrc b/example/golden/testdata/mappingsmerge/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
-
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/objc/.bazelrc b/example/golden/testdata/objc/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
-
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/proto_compiled_sources/.bazelrc b/example/golden/testdata/proto_compiled_sources/.bazelrc
@@ -1 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/proto_repository/.bazelrc b/example/golden/testdata/proto_repository/.bazelrc
@@ -1 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/python/.bazelrc b/example/golden/testdata/python/.bazelrc
@@ -1 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/ruby/.bazelrc b/example/golden/testdata/ruby/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
-
+build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/scala/.bazelrc b/example/golden/testdata/scala/.bazelrc
@@ -1,3 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
 build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
-test --sandbox_debug
diff --git a/example/golden/testdata/starlark_java/.bazelrc b/example/golden/testdata/starlark_java/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
 build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/golden/testdata/strip_import_prefix/.bazelrc b/example/golden/testdata/strip_import_prefix/.bazelrc
@@ -1,2 +1 @@
-build --proto_compiler=@build_stack_rules_proto//toolchain:protoc.exe
 build --host_cxxopt=-std=c++17 --cxxopt=-std=c++17
diff --git a/example/toolchain/prebuilt/BUILD.bazel b/example/toolchain/prebuilt/BUILD.bazel
diff --git a/example/toolchain/prebuilt/README.md b/example/toolchain/prebuilt/README.md
diff --git a/example/toolchain/prebuilt/prebuilt_test.go b/example/toolchain/prebuilt/prebuilt_test.go
diff --git a/pkg/plugin/builtin/BUILD.bazel b/pkg/plugin/builtin/BUILD.bazel
diff --git a/rules/private/proto_repository_tools_srcs.bzl b/rules/private/proto_repository_tools_srcs.bzl
diff --git a/toolchain/BUILD.bazel b/toolchain/BUILD.bazel
