From: Russ Cox <rsc@golang.org>
Date: Mon, 7 Mar 2011 16:33:26 +0000 (-0500)
Subject: goinstall: fix build
X-Git-Tag: weekly.2011-03-15~105
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5946e46138d68014e944069af337e317e3603cf4;p=gostls13.git

goinstall: fix build

func init runs *after* var declarations

TBR=niemeyer
CC=golang-dev
https://golang.org/cl/4260055
---

diff --git a/src/cmd/goinstall/syslist_test.go b/src/cmd/goinstall/syslist_test.go
index a660e69193..795cd293ab 100644
--- a/src/cmd/goinstall/syslist_test.go
+++ b/src/cmd/goinstall/syslist_test.go
@@ -11,17 +11,22 @@ import (
 var (
 	thisOS    = runtime.GOOS
 	thisArch  = runtime.GOARCH
-	otherOS   = "freebsd"
-	otherArch = "arm"
+	otherOS   = anotherOS()
+	otherArch = anotherArch()
 )
 
-func init() {
-	if thisOS == otherOS {
-		otherOS = "linux"
+func anotherOS() string {
+	if thisOS != "darwin" {
+		return "darwin"
 	}
-	if thisArch == otherArch {
-		otherArch = "amd64"
+	return "linux"
+}
+
+func anotherArch() string {
+	if thisArch != "amd64" {
+		return "amd64"
 	}
+	return "386"
 }
 
 type GoodFileTest struct {