From db37050f21466d4890dbe31362b7090a63ad3d8c Mon Sep 17 00:00:00 2001
From: Dave Cheney <dave@cheney.net>
Date: Wed, 22 Jan 2014 12:19:11 +1100
Subject: [PATCH] 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
---
src/cmd/go/build.go | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index c78f2281056..bfadec68ea7 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 = ""
}
}
--
GitLab