From 997b55236ebb5c35a87fa25dd5ec89fe6240d801 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 23 Jul 2020 12:34:08 +0200
Subject: [PATCH] build: fix GOBIN for gomobile commands (#21361)
---
build/ci.go | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/build/ci.go b/build/ci.go
index 07edc80e5..70caef74d 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
}
--
GitLab