diff --git a/goenv/goenv.go b/goenv/goenv.go index 1e62eb35..d87f6f2e 100644 --- a/goenv/goenv.go +++ b/goenv/goenv.go @@ -42,10 +42,14 @@ var TINYGOROOT string func Get(name string) string { switch name { case "GOOS": - if dir := os.Getenv("GOOS"); dir != "" { - return dir + goos := os.Getenv("GOOS") + if goos == "" { + goos = runtime.GOOS } - return runtime.GOOS + if goos == "android" { + goos = "linux" + } + return goos case "GOARCH": if dir := os.Getenv("GOARCH"); dir != "" { return dir