Date: Thursday, December 3, 2020 @ 22:00:20 Author: foxboron Revision: 769822
Removed patch Deleted: go/trunk/fix-ldflags.patch -------------------+ fix-ldflags.patch | 26 -------------------------- 1 file changed, 26 deletions(-) Deleted: fix-ldflags.patch =================================================================== --- fix-ldflags.patch 2020-12-03 21:59:39 UTC (rev 769821) +++ fix-ldflags.patch 2020-12-03 22:00:20 UTC (rev 769822) @@ -1,26 +0,0 @@ -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 2c40a4b..157ac4c 100644 ---- a/src/cmd/go/internal/work/exec.go -+++ b/src/cmd/go/internal/work/exec.go -@@ -2883,6 +2883,21 @@ - idx = bytes.Index(src, []byte(cgoLdflag)) - } - } -+ -+ // We expect to find the contents of cgoLDFLAGS in flags. -+ if len(cgoLDFLAGS) > 0 { -+ outer: -+ for i := range flags { -+ for j, f := range cgoLDFLAGS { -+ if f != flags[i+j] { -+ continue outer -+ } -+ } -+ flags = append(flags[:i], flags[i+len(cgoLDFLAGS):]...) -+ break -+ } -+ } -+ - if err := checkLinkerFlags("LDFLAGS", "go:cgo_ldflag", flags); err != nil { - return nil, nil, err - }