loader: merge go.env file which is now required starting in Go 1.21 to correctly get required packages

deadprogram · aykevl · commit 756cdf44ed5a · 2023-08-13T17:11:11.000+02:00
Signed-off-by: deadprogram &lt;ron@hybridgroup.com&gt;
diff --git a/loader/goroot.go b/loader/goroot.go
@@ -207,6 +207,11 @@ func listGorootMergeLinks(goroot, tinygoroot string, overrides map[string]bool)
 		merges[dir] = filepath.Join(goroot, dir)
 	}
 
+	// Required starting in Go 1.21 due to https://github.com/golang/go/issues/61928
+	if _, err := os.Stat(filepath.Join(goroot, "go.env")); err == nil {
+		merges["go.env"] = filepath.Join(goroot, "go.env")
+	}
+
 	return merges, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,11 @@ func listGorootMergeLinks(goroot, tinygoroot string, overrides map[string]bool)`
`207`	`207`	`merges[dir] = filepath.Join(goroot, dir)`
`208`	`208`	`}`
`209`	`209`
	`210`	`+ // Required starting in Go 1.21 due to https://github.com/golang/go/issues/61928`
	`211`	`+ if _, err := os.Stat(filepath.Join(goroot, "go.env")); err == nil {`
	`212`	`+ merges["go.env"] = filepath.Join(goroot, "go.env")`
	`213`	`+ }`
	`214`	`+`
`210`	`215`	`return merges, nil`
`211`	`216`	`}`
`212`	`217`