loader: merge go.env file which is now required starting in Go 1.21 t…

…o correctly get required packages Signed-off-by: deadprogram <[email protected]>
tinygo-org · Aug 12, 2023 · 59b72f2 · 59b72f2
1 parent 37a4fa2
commit 59b72f2
Showing 1 changed file with 5 additions and 0 deletions.
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
 }