mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-02-04 15:04:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd/ebitenmobile: Use 'go' directly

Browse Source 
See golang/go#26845.
This commit is contained in:
Hajime Hoshi 2020-01-24 22:50:48 +09:00
parent 145f9f9588
commit 9313e3ad0d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ebitenmobile/gomobile.go
View File

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

4
cmd/ebitenmobile/main.go
View File

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