1 files changed, 18 insertions, 12 deletions
diff --git a/src/cmd/internal/obj/util.go b/src/cmd/internal/obj/util.go
index 842e42ba50..2fc910a78f 100644
--- a/src/cmd/internal/obj/util.go
+++ b/src/cmd/internal/obj/util.go
@@ -7,7 +7,6 @@ package obj
 import (
 	"bufio"
 	"fmt"
-	"go/build"
 	"io"
 	"os"
 	"strconv"
@@ -76,16 +75,31 @@ func Bflush(b *Biobuf) error {
 	return b.w.Flush()
 }
 
+func envOr(key, value string) string {
+	if x := os.Getenv(key); x != "" {
+		return x
+	}
+	return value
+}
+
 func Getgoroot() string {
-	return build.Default.GOROOT
+	return envOr("GOROOT", defaultGOROOT)
 }
 
 func Getgoarch() string {
-	return build.Default.GOARCH
+	return envOr("GOARCH", defaultGOARCH)
 }
 
 func Getgoos() string {
-	return build.Default.GOOS
+	return envOr("GOOS", defaultGOOS)
+}
+
+func Getgoarm() string {
+	return envOr("GOARM", defaultGOARM)
+}
+
+func Getgoversion() string {
+	return version
 }
 
 func Atoi(s string) int {
@@ -93,14 +107,6 @@ func Atoi(s string) int {
 	return i
 }
 
-func Getgoarm() string {
-	env := os.Getenv("GOARM")
-	if env != "" {
-		return env
-	}
-	return "5"
-}
-
 func (p *Prog) Line() string {
 	return linklinefmt(p.Ctxt, int(p.Lineno), false, false)
 }