diff --git a/extras/gomock.bzl b/extras/gomock.bzl index 72fbaabc2f..3046c9f1d5 100644 --- a/extras/gomock.bzl +++ b/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") diff --git a/go/private/actions/compilepkg.bzl b/go/private/actions/compilepkg.bzl index 4085f0cf2a..03096a923f 100644 --- a/go/private/actions/compilepkg.bzl +++ b/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, ) diff --git a/go/private/actions/link.bzl b/go/private/actions/link.bzl index 3a1af2863f..bdd58553aa 100644 --- a/go/private/actions/link.bzl +++ b/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): diff --git a/go/private/actions/stdlib.bzl b/go/private/actions/stdlib.bzl index 3dc6fe74d8..c7b889c083 100644 --- a/go/private/actions/stdlib.bzl +++ b/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), diff --git a/go/private/common.bzl b/go/private/common.bzl index fb571eeeae..db24c4aa54 100644 --- a/go/private/common.bzl +++ b/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", ] diff --git a/go/private/context.bzl b/go/private/context.bzl index b1699cf996..22a43bcaea 100644 --- a/go/private/context.bzl +++ b/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", diff --git a/go/private/go_toolchain.bzl b/go/private/go_toolchain.bzl index 2dc3bf4feb..74c865c173 100644 --- a/go/private/go_toolchain.bzl +++ b/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 diff --git a/go/private/rules/binary.bzl b/go/private/rules/binary.bzl index 3d9646dd56..96db3ce130 100644 --- a/go/private/rules/binary.bzl +++ b/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", diff --git a/go/private/rules/go_bin_for_host.bzl b/go/private/rules/go_bin_for_host.bzl index 3f2dca99ef..97a7afbdf7 100644 --- a/go/private/rules/go_bin_for_host.bzl +++ b/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 diff --git a/go/private/rules/info.bzl b/go/private/rules/info.bzl index 28cd1ba0ed..40ef98473d 100644 --- a/go/private/rules/info.bzl +++ b/go/private/rules/info.bzl @@ -17,7 +17,7 @@ load( "go_context", ) load( - "//go/private:go_toolchain.bzl", + "//go/private:common.bzl", "GO_TOOLCHAIN", ) diff --git a/go/private/rules/library.bzl b/go/private/rules/library.bzl index eeb7952442..88955fc14e 100644 --- a/go/private/rules/library.bzl +++ b/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", diff --git a/go/private/rules/nogo.bzl b/go/private/rules/nogo.bzl index 6fed164fbe..b411d7b189 100644 --- a/go/private/rules/nogo.bzl +++ b/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( diff --git a/go/private/rules/source.bzl b/go/private/rules/source.bzl index f92f5f83ae..e6d8ab41f5 100644 --- a/go/private/rules/source.bzl +++ b/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( diff --git a/go/private/rules/stdlib.bzl b/go/private/rules/stdlib.bzl index b1e64f6e88..60c856035b 100644 --- a/go/private/rules/stdlib.bzl +++ b/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( diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl index 84687fc54f..6cf3ac7167 100644 --- a/go/private/rules/test.bzl +++ b/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", diff --git a/proto/compiler.bzl b/proto/compiler.bzl index b0c00b6b59..1d66493989 100644 --- a/proto/compiler.bzl +++ b/proto/compiler.bzl @@ -22,7 +22,7 @@ load( "go_context", ) load( - "//go/private:go_toolchain.bzl", + "//go/private:common.bzl", "GO_TOOLCHAIN", ) load( diff --git a/proto/def.bzl b/proto/def.bzl index 073af3afe1..93ce850915 100644 --- a/proto/def.bzl +++ b/proto/def.bzl @@ -28,7 +28,7 @@ load( "proto_path", ) load( - "//go/private:go_toolchain.bzl", + "//go/private:common.bzl", "GO_TOOLCHAIN", ) load(