diff --git a/build/ci.go b/build/ci.go index 07edc80e59a9baa62ebdfcc1f27ccdd14535b808..70caef74d7bb15418e407e928e43b2f9e1fcd7b2 100644 --- a/build/ci.go +++ b/build/ci.go @@ -884,11 +884,12 @@ func gomobileTool(subcmd string, args ...string) *exec.Cmd { "PATH=" + GOBIN + string(os.PathListSeparator) + os.Getenv("PATH"), } for _, e := range os.Environ() { - if strings.HasPrefix(e, "GOPATH=") || strings.HasPrefix(e, "PATH=") { + if strings.HasPrefix(e, "GOPATH=") || strings.HasPrefix(e, "PATH=") || strings.HasPrefix(e, "GOBIN=") { continue } cmd.Env = append(cmd.Env, e) } + cmd.Env = append(cmd.Env, "GOBIN="+GOBIN) return cmd } @@ -957,7 +958,7 @@ func doXCodeFramework(cmdline []string) { if *local { // If we're building locally, use the build folder and stop afterwards - bind.Dir, _ = filepath.Abs(GOBIN) + bind.Dir = GOBIN build.MustRun(bind) return }