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.

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

backport of linkage fix to v1.21 #194

Merged
Merged
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions patches/003-fix-linkage.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 8973a87168..4968e6c923 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1315,7 +1315,9 @@ func toolenv() []string {
// we disable cgo to get static binaries for cmd/go and cmd/pprof,
// so that they work on systems without the same dynamic libraries
// as the original build system.
- env = append(env, "CGO_ENABLED=0")
+ //
+ // Setting CGO_ENABLED to 0 prevents cmd/go and the like from linking with vendored openssl symbols.
+ // env = append(env, "CGO_ENABLED=0")
}
if isRelease || os.Getenv("GO_BUILDER_NAME") != "" {
// Add -trimpath for reproducible builds of releases.
Loading