Use incompatible_use_toolchain_transition

liucijus · liucijus · commit 5e51126b857e · 2020-10-16T17:25:09.000+03:00
diff --git a/scala_proto/private/scalapb_aspect.bzl b/scala_proto/private/scalapb_aspect.bzl
@@ -246,10 +246,11 @@ scalapb_aspect = aspect(
     attrs = {
         "_protoc": attr.label(
             executable = True,
-            cfg = "host",
+            cfg = "exec",
             default = "@com_google_protobuf//:protoc",
         ),
     },
+    incompatible_use_toolchain_transition = True,
     toolchains = [
         "@io_bazel_rules_scala//scala:toolchain_type",
         "@io_bazel_rules_scala//scala_proto:toolchain_type",
diff --git a/scala_proto/scala_proto_toolchain.bzl b/scala_proto/scala_proto_toolchain.bzl
@@ -77,5 +77,6 @@ export_scalapb_toolchain_deps = rule(
             mandatory = True,
         ),
     },
+    incompatible_use_toolchain_transition = True,
     toolchains = ["@io_bazel_rules_scala//scala_proto:deps_toolchain_type"],
 )

Original file line number	Diff line number	Diff line change
`@@ -77,5 +77,6 @@ export_scalapb_toolchain_deps = rule(`
`77`	`77`	`mandatory = True,`
`78`	`78`	`),`
`79`	`79`	`},`
	`80`	`+ incompatible_use_toolchain_transition = True,`
`80`	`81`	`toolchains = ["@io_bazel_rules_scala//scala_proto:deps_toolchain_type"],`
`81`	`82`	`)`