From: Dave Cheney <dave@cheney.net>
Date: Wed, 22 Jan 2014 01:19:11 +0000 (+1100)
Subject: cmd/go: do not require a valid archChar when using -compiler gccgo
X-Git-Tag: go1.3beta1~907
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=db37050f21466d4890dbe31362b7090a63ad3d8c;p=gostls13.git

cmd/go: do not require a valid archChar when using -compiler gccgo

Fixes #7152.

R=iant, rsc, gobot
CC=golang-codereviews
https://golang.org/cl/54790044
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index c78f228105..bfadec68ea 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -350,7 +350,12 @@ func init() {
 	var err error
 	archChar, err = build.ArchChar(goarch)
 	if err != nil {
-		fatalf("%s", err)
+		if _, isgc := buildToolchain.(gcToolchain); isgc {
+			fatalf("%s", err)
+		}
+		// archChar is only required for gcToolchain, if we're using
+		// another toolchain leave it blank.
+		archChar = ""
 	}
 }