1*4882a593SmuzhiyunFrom bdd69b55387f80c8df18d0af5008bf5e1a66be6a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alexander Kanavin <alex.kanavin@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 23 Nov 2020 19:22:04 +0000 4*4882a593SmuzhiyunSubject: [PATCH] exec.go: do not write linker flags into buildids 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe flags can contain build-specific paths, breaking reproducibility. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunTo make this acceptable to upstream, we probably need to trim the flags, 9*4882a593Smuzhiyunremoving those known to be buildhost-specific. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUpstream-Status: Inappropriate [needs upstream discussion] 12*4882a593SmuzhiyunSigned-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun src/cmd/go/internal/work/exec.go | 4 ++-- 15*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go 18*4882a593Smuzhiyunindex 696db23..727d40b 100644 19*4882a593Smuzhiyun--- a/src/cmd/go/internal/work/exec.go 20*4882a593Smuzhiyun+++ b/src/cmd/go/internal/work/exec.go 21*4882a593Smuzhiyun@@ -1136,7 +1136,7 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID { 22*4882a593Smuzhiyun } 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun // Toolchain-dependent configuration, shared with b.linkSharedActionID. 25*4882a593Smuzhiyun- b.printLinkerConfig(h, p) 26*4882a593Smuzhiyun+ //b.printLinkerConfig(h, p) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun // Input files. 29*4882a593Smuzhiyun for _, a1 := range a.Deps { 30*4882a593Smuzhiyun@@ -1418,7 +1418,7 @@ func (b *Builder) linkSharedActionID(a *Action) cache.ActionID { 31*4882a593Smuzhiyun fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun // Toolchain-dependent configuration, shared with b.linkActionID. 34*4882a593Smuzhiyun- b.printLinkerConfig(h, nil) 35*4882a593Smuzhiyun+ //b.printLinkerConfig(h, nil) 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun // Input files. 38*4882a593Smuzhiyun for _, a1 := range a.Deps { 39*4882a593Smuzhiyun-- 40*4882a593Smuzhiyun2.17.1 41*4882a593Smuzhiyun 42