Skip to content

Commit

Permalink
cmd/go: don't fail on invalid GOOS/GOARCH pair when using gccgo
Browse files Browse the repository at this point in the history
Fixes #12272

Change-Id: I0306ce0ef4a87df2158df3b7d4d8d93a1cb6dabc
Reviewed-on: https://go-review.googlesource.com/24864
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
  • Loading branch information
bradfitz committed Jul 12, 2016
1 parent b30814b commit a1110c3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/cmd/go/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -673,11 +673,6 @@ func init() {
goarch = buildContext.GOARCH
goos = buildContext.GOOS

if _, ok := osArchSupportsCgo[goos+"/"+goarch]; !ok {
fmt.Fprintf(os.Stderr, "cmd/go: unsupported GOOS/GOARCH pair %s/%s\n", goos, goarch)
os.Exit(2)
}

if goos == "windows" {
exeSuffix = ".exe"
}
Expand Down Expand Up @@ -1226,6 +1221,11 @@ func allArchiveActions(root *action) []*action {

// do runs the action graph rooted at root.
func (b *builder) do(root *action) {
if _, ok := osArchSupportsCgo[goos+"/"+goarch]; !ok && buildContext.Compiler == "gc" {
fmt.Fprintf(os.Stderr, "cmd/go: unsupported GOOS/GOARCH pair %s/%s\n", goos, goarch)
os.Exit(2)
}

// Build list of all actions, assigning depth-first post-order priority.
// The original implementation here was a true queue
// (using a channel) but it had the effect of getting
Expand Down

0 comments on commit a1110c3

Please sign in to comment.