16306: Fix env var ordering.
authorTom Clegg <tom@curii.com>
Mon, 28 Dec 2020 15:35:39 +0000 (10:35 -0500)
committerTom Clegg <tom@curii.com>
Mon, 28 Dec 2020 15:35:39 +0000 (10:35 -0500)
Ensure our GOBIN takes precedence over inherited value.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/install/deps.go

index 4f5b251cb27af575338124213638aaaeed7606a5..049df2564ad54a01094cce813bab427748e358b8 100644 (file)
@@ -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