42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
From bdd69b55387f80c8df18d0af5008bf5e1a66be6a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
Date: Mon, 23 Nov 2020 19:22:04 +0000
|
||
|
|
Subject: [PATCH] exec.go: do not write linker flags into buildids
|
||
|
|
|
||
|
|
The flags can contain build-specific paths, breaking reproducibility.
|
||
|
|
|
||
|
|
To make this acceptable to upstream, we probably need to trim the flags,
|
||
|
|
removing those known to be buildhost-specific.
|
||
|
|
|
||
|
|
Upstream-Status: Inappropriate [needs upstream discussion]
|
||
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
---
|
||
|
|
src/cmd/go/internal/work/exec.go | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
|
||
|
|
index 696db23..727d40b 100644
|
||
|
|
--- a/src/cmd/go/internal/work/exec.go
|
||
|
|
+++ b/src/cmd/go/internal/work/exec.go
|
||
|
|
@@ -1136,7 +1136,7 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID {
|
||
|
|
}
|
||
|
|
|
||
|
|
// Toolchain-dependent configuration, shared with b.linkSharedActionID.
|
||
|
|
- b.printLinkerConfig(h, p)
|
||
|
|
+ //b.printLinkerConfig(h, p)
|
||
|
|
|
||
|
|
// Input files.
|
||
|
|
for _, a1 := range a.Deps {
|
||
|
|
@@ -1418,7 +1418,7 @@ func (b *Builder) linkSharedActionID(a *Action) cache.ActionID {
|
||
|
|
fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch)
|
||
|
|
|
||
|
|
// Toolchain-dependent configuration, shared with b.linkActionID.
|
||
|
|
- b.printLinkerConfig(h, nil)
|
||
|
|
+ //b.printLinkerConfig(h, nil)
|
||
|
|
|
||
|
|
// Input files.
|
||
|
|
for _, a1 := range a.Deps {
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|