Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

loader: merge go.env file which is now required starting in Go 1.21 #3866

Merged
merged 1 commit into from
Aug 13, 2023
Merged

loader: merge go.env file which is now required starting in Go 1.21 #3866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions loader/goroot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading