status-im
/
mobile
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/gobind: add GOROOT to cmd.Env from ctx.GOROOT 

In two places gobind launches go commands but does not pass along
the system's GOROOT causing the subprocess go's to look in
/usr/local/go and fail if GOROOT is not there.

Fixes golang/go#18209

Change-Id: Ica9455c0b15ba57afc5699b7757d67aa4231c508
Reviewed-on: https://go-review.googlesource.com/46671
Reviewed-by: Elias Naur <elias.naur@gmail.com>
This commit is contained in:
Dan Ballard 2017-06-25 18:52:56 -07:00 committed by Elias Naur
parent 44a54e9b78
commit e1125eeafd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/gobind/gen.go
View File

@ -180,7 +180,8 @@ func genJavaPackages(ctx *build.Context, dir string, classes []*java.Class, embe
"-pkgdir="+filepath.Join(dir, "pkg", ctx.GOOS+"_"+ctx.GOARCH),
"Java/...",
)
cmd.Env = append(cmd.Env, "GOPATH="+dir)
cmd.Env = append(os.Environ(), "GOPATH="+dir)
cmd.Env = append(cmd.Env, "GOROOT="+ctx.GOROOT)
if out, err := cmd.CombinedOutput(); err != nil {
return fmt.Errorf("failed to go install the generated Java wrappers: %v: %s", err, string(out))
}

1
cmd/gobind/main.go
View File

@ -92,6 +92,7 @@ func main() {
cmd := exec.Command("go", "install")
cmd.Args = append(cmd.Args, flag.Args()...)
cmd.Env = append(os.Environ(), "GOPATH="+ctx.GOPATH)
cmd.Env = append(cmd.Env, "GOROOT="+ctx.GOROOT)
if err := cmd.Run(); err != nil {
// Only report I/O errors. Errors from go install is expected for as-yet
// undefined Java wrappers.