mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd/ebitenmobile: Use GOROOT/bin/go instead of go

Browse Source 
Fixes #927
This commit is contained in:
Hajime Hoshi 2019-08-24 01:06:14 +09:00
parent c49815a2b2
commit a42b5274df
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ebitenmobile/gomobile.go
View File

@ -20,6 +20,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"runtime"
) )
const gomobileHash = "597adff16ade9d88626f8caea514bb189b8c74ee" const gomobileHash = "597adff16ade9d88626f8caea514bb189b8c74ee"
@ -54,7 +55,8 @@ func runGo(args ...string) error {
env := []string{ env := []string{
"GO111MODULE=on", "GO111MODULE=on",
} }
return runCommand("go", args, env) gocmd := filepath.Join(runtime.GOROOT(), "bin", "go")
return runCommand(gocmd, args, env)
} }
func prepareGomobileCommands() error { func prepareGomobileCommands() error {

4
cmd/ebitenmobile/main.go
View File

@ -22,6 +22,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
"text/template" "text/template"
@ -45,7 +46,8 @@ func goEnv(name string) string {
if val := os.Getenv(name); val != "" { if val := os.Getenv(name); val != "" {
return val return val
} }
val, err := exec.Command("go", "env", name).Output() gocmd := filepath.Join(runtime.GOROOT(), "bin", "go")
val, err := exec.Command(gocmd, "env", name).Output()
if err != nil { if err != nil {
panic(err) panic(err)
} }