[cc] Add cc toolchain to starlark cc_proto_library (bazelbuild#16661)

ShreeM01 · Yannic · web-flow · commit 72e6e948d30d · 2022-11-04T12:06:24.000-07:00
Fixes bazelbuild#16577 Closes bazelbuild#16585. PiperOrigin-RevId: 485600476 Change-Id: I3c2985731ff800a2c6136f401ed3c7e5e89518ad Co-authored-by: Yannic <contact@yannic-bonenberger.com>
diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_proto_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_proto_library.bzl
@@ -267,6 +267,7 @@ _cc_proto_aspect = aspect(
         ),
         "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"),
     },
+    toolchains = cc_helper.use_cpp_toolchain(),
 )
 
 def _impl(ctx):
diff --git a/src/test/shell/bazel/bazel_proto_library_test.sh b/src/test/shell/bazel/bazel_proto_library_test.sh
@@ -565,6 +565,35 @@ EOF
   bazel build //a:c || fail "build failed"
 }
 
+function test_cc_proto_library_with_toolchain_resolution() {
+  write_workspace ""
+  mkdir -p a
+  cat > a/BUILD <<EOF
+load("@rules_proto//proto:defs.bzl", "proto_library")
+proto_library(name='p', srcs=['p.proto'])
+cc_proto_library(name='cp', deps=[':p'])
+cc_library(name='c', srcs=['c.cc'], deps=[':cp'])
+EOF
+
+  cat > a/p.proto <<EOF
+syntax = "proto2";
+package a;
+message A {
+  optional int32 a = 1;
+}
+EOF
+
+  cat > a/c.cc <<EOF
+#include "a/p.pb.h"
+
+void f() {
+  a::A a;
+}
+EOF
+
+  bazel build --incompatible_enable_cc_toolchain_resolution //a:c || fail "build failed"
+}
+
 function test_cc_proto_library_import_prefix_stripping() {
   write_workspace ""
   mkdir -p a/dir

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,7 @@ _cc_proto_aspect = aspect(`
`267`	`267`	`),`
`268`	`268`	`"_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"),`
`269`	`269`	`},`
	`270`	`+ toolchains = cc_helper.use_cpp_toolchain(),`
`270`	`271`	`)`
`271`	`272`
`272`	`273`	`def _impl(ctx):`