From 9de57244e1708cbdac5b8d53e5cf7eea788f3f33 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Thu, 21 Apr 2022 11:19:56 -0400 Subject: [PATCH] go/build: replace a call to os.Environ with (*exec.Cmd).Environ This is a code simplification using the new API added in #50599. Change-Id: Icb9628bcd0daa3dc2d653e9654b38099730137d1 Reviewed-on: https://go-review.googlesource.com/c/go/+/401535 Run-TryBot: Bryan Mills TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor --- src/go/build/build.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/go/build/build.go b/src/go/build/build.go index 17fef051b3f..bfa9cd60fb1 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go @@ -1185,20 +1185,13 @@ func (ctxt *Context) importGo(p *Package, path, srcDir string, mode ImportMode) if ctxt.CgoEnabled { cgo = "1" } - cmd.Env = append(os.Environ(), + cmd.Env = append(cmd.Environ(), "GOOS="+ctxt.GOOS, "GOARCH="+ctxt.GOARCH, "GOROOT="+ctxt.GOROOT, "GOPATH="+ctxt.GOPATH, "CGO_ENABLED="+cgo, ) - if cmd.Dir != "" { - // If possible, set PWD: if an error occurs and PWD includes a symlink, we - // want the error to refer to Dir, not some other name for it. - if abs, err := filepath.Abs(cmd.Dir); err == nil { - cmd.Env = append(cmd.Env, "PWD="+abs) - } - } if err := cmd.Run(); err != nil { return fmt.Errorf("go/build: go list %s: %v\n%s\n", path, err, stderr.String())