Revert "Add automatic platform detection from inbound crosstool_top a…

…nd cpu (#2859)"

This reverts commit 026db6d.

Bazel is migrating to platforms and toolchains resolution, but this
logic frequently reset platforms back based on the value of the
legacy `--cpu` and `--crosstool_top` flags. Instead, users of rules that
still rely on these flags should use the `platform_mappings` file.

go/platform/BUILD.bazel

@@ -36,8 +36,3 @@ bzl_library(
     name = "apple",
     srcs = ["apple.bzl"],
 )
-
-bzl_library(
-    name = "crosstool",
-    srcs = ["crosstool.bzl"],
-)

go/private/rules/BUILD.bazel

@@ -144,7 +144,6 @@ bzl_library(
         "//proto:__pkg__",
     ],
     deps = [
-        "//go/platform:crosstool",
         "//go/private:mode",
         "//go/private:platforms",
         "//go/private:providers",

go/private/rules/transition.bzl

@@ -32,10 +32,6 @@ load(
     "GoLibrary",
     "GoSource",
 )
-load(
-    "//go/platform:crosstool.bzl",
-    "platform_from_crosstool",
-)
 
 _DEFAULT_PLATFORMS_VALUE = [Label("@local_config_platform//:host")]
 _PLATFORMS_LABEL = "//command_line_option:platforms"
@@ -101,8 +97,6 @@ def _go_transition_impl(settings, attr):
 
     goos = getattr(attr, "goos", "auto")
     goarch = getattr(attr, "goarch", "auto")
-    crosstool_top = settings.pop("//command_line_option:crosstool_top")
-    cpu = settings.pop("//command_line_option:cpu")
     _check_ternary("pure", pure)
     if goos != "auto" or goarch != "auto":
         if goos == "auto":
@@ -115,17 +109,6 @@ def _go_transition_impl(settings, attr):
             fail('pure is "off" but cgo is not supported on {} {}'.format(goos, goarch))
         platform = "@io_bazel_rules_go//go/toolchain:{}_{}{}".format(goos, goarch, "_cgo" if cgo else "")
         settings["//command_line_option:platforms"] = platform
-    else:
-        # If the current target platform differs from the default value (the
-        # host platform), then we don't want to override it with a value
-        # inferred from the legacy --cpu and --crosstool_top flags. Otherwise
-        # it would become impossible to "platformize" a Go build without having
-        # a matching platform mappings file.
-        if settings[_PLATFORMS_LABEL] == _DEFAULT_PLATFORMS_VALUE:
-            # Detect the platform the inbound crosstool/cpu.
-            platform = platform_from_crosstool(crosstool_top, cpu)
-            if platform:
-                settings[_PLATFORMS_LABEL] = platform
 
     tags = getattr(attr, "gotags", [])
     if tags:
@@ -181,8 +164,6 @@ request_nogo_transition = transition(
 go_transition = transition(
     implementation = _go_transition_impl,
     inputs = [
-        "//command_line_option:cpu",
-        "//command_line_option:crosstool_top",
         "//command_line_option:platforms",
     ] + TRANSITIONED_GO_SETTING_KEYS,
     outputs = [

go/tools/gopackagesdriver/BUILD.bazel

@@ -21,6 +21,7 @@ go_library(
 go_binary(
     name = "gopackagesdriver",
     embed = [":gopackagesdriver_lib"],
+    visibility = ["//visibility:public"],
     x_defs = {
         # Determine the name of the rules_go repository as we need to specify it when invoking the
         # aspect.
@@ -35,5 +36,4 @@ go_binary(
         #       use "@" + repository_name().
         "rulesGoRepositoryName": "@" + repository_name() if bazel_supports_canonical_label_literals() else repository_name(),
     },
-    visibility = ["//visibility:public"],
 )

tests/core/cross/BUILD.bazel

@@ -35,7 +35,10 @@ go_binary(
 
 go_binary(
     name = "asm_cross",
-    srcs = ["asm.s", "main.go"],
+    srcs = [
+        "asm.s",
+        "main.go",
+    ],
     goarch = "386",
     goos = "linux",
     deps = [":platform_lib"],