From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Thu, 26 Sep 2019 19:04:00 +0000 (+0000)
Subject: cmd/dist: fix bootstrap failure when GOHOSTARCH is set
X-Git-Tag: go1.14beta1~945
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e1b1b7856f416ca6ff086adc00adc89fd900992c;p=gostls13.git

cmd/dist: fix bootstrap failure when GOHOSTARCH is set

Fixes #33977

Change-Id: I4b136788f08b08c53087af8d3cd56125e620b51b
Reviewed-on: https://go-review.googlesource.com/c/go/+/197602
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
---

diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
index f293891511..f27ea17230 100644
--- a/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@ -250,6 +250,9 @@ func isUnneededSSARewriteFile(srcFile string) (archCaps string, unneeded bool) {
 	archCaps = fileArch
 	fileArch = strings.ToLower(fileArch)
 	fileArch = strings.TrimSuffix(fileArch, "splitload")
+	if fileArch == os.Getenv("GOHOSTARCH") {
+		return "", false
+	}
 	if fileArch == strings.TrimSuffix(runtime.GOARCH, "le") {
 		return "", false
 	}