Fix the prefer_prebuilt_protoc alias to use the correct originally announced location

mkruskal-google · tonyliaoss · commit 732ed49b0ae3 · 2026-02-05T14:46:04.000-05:00
PiperOrigin-RevId: 865584147
diff --git a/bazel/BUILD b/bazel/BUILD
@@ -87,8 +87,3 @@ filegroup(
         "//bazel/private:__pkg__",
     ],
 )
-
-alias(
-    name = "prefer_prebuilt_protoc",
-    actual = "//bazel/flags:prefer_prebuilt_protoc",
-)
diff --git a/bazel/flags/BUILD b/bazel/flags/BUILD
@@ -41,7 +41,7 @@ bool_flag(
     name = "prefer_prebuilt_protoc",
     # TODO: this should be True after the feature is vetted with some adoption
     build_setting_default = False,
-    visibility = ["//bazel:__pkg__"],
+    visibility = ["//bazel/toolchains:__pkg__"],
 )
 
 config_setting(
diff --git a/bazel/toolchains/BUILD b/bazel/toolchains/BUILD
@@ -41,3 +41,8 @@ filegroup(
         "//bazel:__pkg__",
     ],
 )
+
+alias(
+    name = "prefer_prebuilt_protoc",
+    actual = "//bazel/flags:prefer_prebuilt_protoc",
+)
diff --git a/examples/example_without_cc_toolchain/.bazelrc b/examples/example_without_cc_toolchain/.bazelrc
@@ -3,4 +3,4 @@ common --per_file_copt=external/.*protobuf.*/src/google/protobuf/compiler/main.c
 common --host_per_file_copt=external/.*protobuf.*/src/google/protobuf/compiler/main.cc@--THIS_CC_TOOLCHAIN_IS_BROKEN
 # But, users should be able to use pre-built protoc toolchains instead.
 common --incompatible_enable_proto_toolchain_resolution
-common --@com_google_protobuf//bazel:prefer_prebuilt_protoc
+common --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,3 @@ filegroup(`
`87`	`87`	`"//bazel/private:__pkg__",`
`88`	`88`	`],`
`89`	`89`	`)`
`90`		`-`
`91`		`-alias(`
`92`		`- name = "prefer_prebuilt_protoc",`
`93`		`- actual = "//bazel/flags:prefer_prebuilt_protoc",`
`94`		`-)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ bool_flag(`
`41`	`41`	`name = "prefer_prebuilt_protoc",`
`42`	`42`	`# TODO: this should be True after the feature is vetted with some adoption`
`43`	`43`	`build_setting_default = False,`
`44`		`- visibility = ["//bazel:__pkg__"],`
	`44`	`+ visibility = ["//bazel/toolchains:__pkg__"],`
`45`	`45`	`)`
`46`	`46`
`47`	`47`	`config_setting(`
Original file line number	Diff line number	Diff line change
`@@ -41,3 +41,8 @@ filegroup(`
`41`	`41`	`"//bazel:__pkg__",`
`42`	`42`	`],`
`43`	`43`	`)`
	`44`	`+`
	`45`	`+alias(`
	`46`	`+ name = "prefer_prebuilt_protoc",`
	`47`	`+ actual = "//bazel/flags:prefer_prebuilt_protoc",`
	`48`	`+)`