4 files changed, 10 insertions, 4 deletions
diff --git a/etc/defaults/CC/proto/TARGETS.just b/etc/defaults/CC/proto/TARGETS.just
index 95ae1b00..4f6db7bf 100644
--- a/etc/defaults/CC/proto/TARGETS.just
+++ b/etc/defaults/CC/proto/TARGETS.just
@@ -7,8 +7,8 @@
 , "service defaults":
   { "type": ["CC/proto", "defaults"]
   , "base": ["defaults"]
-  , "GRPC_PLUGIN": ["grpc_cpp_plugin"]
+  , "GRPC_PLUGIN": ["bin/grpc_cpp_plugin"]
   , "deps": [["@", "grpc", "", "grpc++"]]
-  , "toolchain": [["@", "grpc", "", "grpc_cpp_plugin"]]
+  , "toolchain": [["@", "grpc", "", "toolchain"]]
   }
 }
diff --git a/etc/import.pkgconfig/TARGETS.grpc b/etc/import.pkgconfig/TARGETS.grpc
index eb5bca6e..bb2518bf 100644
--- a/etc/import.pkgconfig/TARGETS.grpc
+++ b/etc/import.pkgconfig/TARGETS.grpc
@@ -7,4 +7,5 @@
   {"type": ["@", "rules", "CC/pkgconfig", "system_library"], "name": ["grpc"]}
 , "gpr":
   {"type": ["@", "rules", "CC/pkgconfig", "system_library"], "name": ["gpr"]}
+, "toolchain": {"type": "install", "deps": ["bin/grpc_cpp_plugin"]}
 }
diff --git a/etc/import/TARGETS.grpc b/etc/import/TARGETS.grpc
index d23ad660..627f8fd4 100644
--- a/etc/import/TARGETS.grpc
+++ b/etc/import/TARGETS.grpc
@@ -2281,4 +2281,8 @@
     , "PKG_CONFIG_ARGS"
     ]
   }
+, "toolchain":
+  { "type": ["@", "rules", "CC", "install-with-deps"]
+  , "targets": ["grpc_cpp_plugin"]
+  }
 }
diff --git a/etc/import/TARGETS.protobuf b/etc/import/TARGETS.protobuf
index 3c7da355..6492a383 100644
--- a/etc/import/TARGETS.protobuf
+++ b/etc/import/TARGETS.protobuf
@@ -89,10 +89,11 @@
     , "PKG_CONFIG_ARGS"
     ]
   }
+, "installed protoc":
+  {"type": ["@", "rules", "CC", "install-with-deps"], "targets": ["protoc"]}
 , "toolchain_headers": {"type": "install", "deps": ["libprotobuf"]}
 , "toolchain":
   { "type": "install"
-  , "files": {"bin/protoc": "protoc"}
-  , "dirs": [["toolchain_headers", "include"]]
+  , "dirs": [["installed protoc", "."], ["toolchain_headers", "include"]]
   }
 }