From 9c139cc4e2f519e2deb3617918a9199b76c33f10 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 28 Dec 2020 10:35:39 -0500 Subject: [PATCH] 16306: Fix env var ordering. Ensure our GOBIN takes precedence over inherited value. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/install/deps.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/install/deps.go b/lib/install/deps.go index 4f5b251cb2..049df2564a 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -508,7 +508,8 @@ rm ${zip} } { fmt.Fprintf(stderr, "building %s...\n", srcdir) cmd := exec.Command("go", "install", "-ldflags", "-X git.arvados.org/arvados.git/lib/cmd.version="+inst.PackageVersion+" -X main.version="+inst.PackageVersion) - cmd.Env = append([]string{"GOBIN=/var/lib/arvados/bin"}, os.Environ()...) + cmd.Env = append(cmd.Env, os.Environ()...) + cmd.Env = append(cmd.Env, "GOBIN=/var/lib/arvados/bin") cmd.Dir = filepath.Join(inst.SourcePath, srcdir) cmd.Stdout = stdout cmd.Stderr = stderr -- 2.30.2