cmd/dist: assume amd64 on OS X, don't run sysctl

Fixes #13425.

Change-Id: I82f49d07841e89fc4f3fde9ea41e710a634579d0
Reviewed-on: https://go-review.googlesource.com/18313
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/dist/util.go b/src/cmd/dist/util.go
index d52c7113f6465bb96dca809129f6732362e2fa83..1b42954cc3d2be2255abb071f76eeb396af66bde 100644 (file)
--- a/src/cmd/dist/util.go
+++ b/src/cmd/dist/util.go
@@ -401,9 +401,8 @@ func main() {
        switch gohostos {
        case "darwin":
                // Even on 64-bit platform, darwin uname -m prints i386.
-               if strings.Contains(run("", CheckExit, "sysctl", "machdep.cpu.extfeatures"), "EM64T") {
-                       gohostarch = "amd64"
-               }
+               // We don't support any of the OS X versions that run on 32-bit-only hardware anymore.
+               gohostarch = "amd64"
        case "freebsd":
                // Since FreeBSD 10 gcc is no longer part of the base system.
                defaultclang = true