Add toolchain param to affected actions (#3740)

* Add toolchain param to affected actions

* Move GO_TOOLCHAIN to common.bzl

* Update new location of GO_TOOLCHAIN

* Fix error

* Format files

Author: kotlaja

extras/gomock.bzl

@@ -23,7 +23,7 @@
 # DO NOT USE IT.
 
 load("//go/private:context.bzl", "go_context")
-load("//go/private:go_toolchain.bzl", "GO_TOOLCHAIN")
+load("//go/private:common.bzl", "GO_TOOLCHAIN")
 load("//go/private/rules:wrappers.bzl", go_binary = "go_binary_macro")
 load("//go/private:providers.bzl", "GoLibrary")
 load("@bazel_skylib//lib:paths.bzl", "paths")

go/private/actions/compilepkg.bzl

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("//go/private:common.bzl", "GO_TOOLCHAIN")
 load(
     "//go/private:mode.bzl",
     "link_mode_args",
@@ -162,4 +163,5 @@ def emit_compilepkg(
         executable = go.toolchain._builder,
         arguments = [args],
         env = go.env,
+        toolchain = GO_TOOLCHAIN,
     )

go/private/actions/link.bzl

@@ -14,6 +14,7 @@
 
 load(
     "//go/private:common.bzl",
+    "GO_TOOLCHAIN",
     "as_set",
     "count_group_matches",
     "has_shared_lib_extension",
@@ -209,6 +210,7 @@ def emit_link(
         executable = go.toolchain._builder,
         arguments = [builder_args, "--", tool_args],
         env = go.env,
+        toolchain = GO_TOOLCHAIN,
     )
 
 def _extract_extldflags(gc_linkopts, extldflags):

go/private/actions/stdlib.bzl

@@ -15,6 +15,7 @@
 load(
     "//go/private:common.bzl",
     "COVERAGE_OPTIONS_DENYLIST",
+    "GO_TOOLCHAIN",
 )
 load(
     "//go/private:providers.bzl",
@@ -82,6 +83,7 @@ def _build_stdlib_list_json(go):
         executable = go.toolchain._builder,
         arguments = [args],
         env = _build_env(go),
+        toolchain = GO_TOOLCHAIN,
     )
     return out
 
@@ -149,6 +151,7 @@ def _build_stdlib(go):
         executable = go.toolchain._builder,
         arguments = [args],
         env = _build_env(go),
+        toolchain = GO_TOOLCHAIN,
     )
     return GoStdLib(
         _list_json = _build_stdlib_list_json(go),

go/private/common.bzl

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+GO_TOOLCHAIN = "@io_bazel_rules_go//go:toolchain"
+
 go_exts = [
     ".go",
 ]

go/private/context.bzl

@@ -26,10 +26,6 @@ load(
     "OBJCPP_COMPILE_ACTION_NAME",
     "OBJC_COMPILE_ACTION_NAME",
 )
-load(
-    ":go_toolchain.bzl",
-    "GO_TOOLCHAIN",
-)
 load(
     ":providers.bzl",
     "CgoContextInfo",
@@ -52,6 +48,7 @@ load(
 load(
     ":common.bzl",
     "COVERAGE_OPTIONS_DENYLIST",
+    "GO_TOOLCHAIN",
     "as_iterable",
     "goos_to_extension",
     "goos_to_shared_extension",

go/private/go_toolchain.bzl

@@ -15,6 +15,7 @@
 Toolchain rules used by go.
 """
 
+load("//go/private:common.bzl", "GO_TOOLCHAIN")
 load("//go/private:platforms.bzl", "PLATFORMS")
 load("//go/private:providers.bzl", "GoSDK")
 load("//go/private/actions:archive.bzl", "emit_archive")
@@ -23,8 +24,6 @@ load("//go/private/actions:link.bzl", "emit_link")
 load("//go/private/actions:stdlib.bzl", "emit_stdlib")
 load("@bazel_skylib//lib:selects.bzl", "selects")
 
-GO_TOOLCHAIN = "@io_bazel_rules_go//go:toolchain"
-
 def _go_toolchain_impl(ctx):
     sdk = ctx.attr.sdk[GoSDK]
     cross_compile = ctx.attr.goos != sdk.goos or ctx.attr.goarch != sdk.goarch

go/private/rules/binary.bzl

@@ -18,14 +18,11 @@ load(
 )
 load(
     "//go/private:common.bzl",
+    "GO_TOOLCHAIN",
     "asm_exts",
     "cgo_exts",
     "go_exts",
 )
-load(
-    "//go/private:go_toolchain.bzl",
-    "GO_TOOLCHAIN",
-)
 load(
     "//go/private:providers.bzl",
     "GoLibrary",

go/private/rules/go_bin_for_host.bzl

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS")
-load("//go/private:go_toolchain.bzl", "GO_TOOLCHAIN")
+load("//go/private:common.bzl", "GO_TOOLCHAIN")
 
 def _ensure_target_cfg(ctx):
     # A target is assumed to be built in the target configuration if it is neither in the exec nor

go/private/rules/info.bzl

@@ -17,7 +17,7 @@ load(
     "go_context",
 )
 load(
-    "//go/private:go_toolchain.bzl",
+    "//go/private:common.bzl",
     "GO_TOOLCHAIN",
 )
 

go/private/rules/library.bzl

@@ -14,6 +14,7 @@
 
 load(
     "//go/private:common.bzl",
+    "GO_TOOLCHAIN",
     "asm_exts",
     "cgo_exts",
     "go_exts",
@@ -22,10 +23,6 @@ load(
     "//go/private:context.bzl",
     "go_context",
 )
-load(
-    "//go/private:go_toolchain.bzl",
-    "GO_TOOLCHAIN",
-)
 load(
     "//go/private:providers.bzl",
     "GoLibrary",

go/private/rules/nogo.bzl

@@ -17,7 +17,7 @@ load(
     "go_context",
 )
 load(
-    "//go/private:go_toolchain.bzl",
+    "//go/private:common.bzl",
     "GO_TOOLCHAIN",
 )
 load(

go/private/rules/source.bzl

@@ -17,7 +17,7 @@ load(
     "go_context",
 )
 load(
-    "//go/private:go_toolchain.bzl",
+    "//go/private:common.bzl",
     "GO_TOOLCHAIN",
 )
 load(

go/private/rules/stdlib.bzl

@@ -17,7 +17,7 @@ load(
     "go_context",
 )
 load(
-    "//go/private:go_toolchain.bzl",
+    "//go/private:common.bzl",
     "GO_TOOLCHAIN",
 )
 load(

go/private/rules/test.bzl

@@ -18,16 +18,13 @@ load(
 )
 load(
     "//go/private:common.bzl",
+    "GO_TOOLCHAIN",
     "as_list",
     "asm_exts",
     "cgo_exts",
     "go_exts",
     "split_srcs",
 )
-load(
-    "//go/private:go_toolchain.bzl",
-    "GO_TOOLCHAIN",
-)
 load(
     "//go/private/rules:binary.bzl",
     "gc_linkopts",

proto/compiler.bzl

@@ -22,7 +22,7 @@ load(
     "go_context",
 )
 load(
-    "//go/private:go_toolchain.bzl",
+    "//go/private:common.bzl",
     "GO_TOOLCHAIN",
 )
 load(

proto/def.bzl

@@ -28,7 +28,7 @@ load(
     "proto_path",
 )
 load(
-    "//go/private:go_toolchain.bzl",
+    "//go/private:common.bzl",
     "GO_TOOLCHAIN",
 )
 load(