qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 05:54:46 -07:00
Code Releases Activity

go/build: replace a call to os.Environ with (*exec.Cmd).Environ

Browse Source 
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 <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Bryan C. Mills 2022-04-21 11:19:56 -04:00 committed by Bryan Mills
parent 824b0a34b7
commit 9de57244e1
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/go/build/build.go
View File

@ -1185,20 +1185,13 @@ func (ctxt *Context) importGo(p *Package, path, srcDir string, mode ImportMode)
if ctxt.CgoEnabled { if ctxt.CgoEnabled {
cgo = "1" cgo = "1"
} }
cmd.Env = append(os.Environ(), cmd.Env = append(cmd.Environ(),
"GOOS="+ctxt.GOOS, "GOOS="+ctxt.GOOS,
"GOARCH="+ctxt.GOARCH, "GOARCH="+ctxt.GOARCH,
"GOROOT="+ctxt.GOROOT, "GOROOT="+ctxt.GOROOT,
"GOPATH="+ctxt.GOPATH, "GOPATH="+ctxt.GOPATH,
"CGO_ENABLED="+cgo, "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 { if err := cmd.Run(); err != nil {
return fmt.Errorf("go/build: go list %s: %v\n%s\n", path, err, stderr.String()) return fmt.Errorf("go/build: go list %s: %v\n%s\n", path, err, stderr.String())