-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
backport of fix linkage in RHEL builds to go1.21
- Loading branch information
Showing
1 changed file
with
15 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |