blob: 0662f66af52ef1ef06660bab3dbd8492d989747e [file] [log] [blame]
Patrick Williamsb58112e2024-03-07 11:16:36 -06001From e0999902687e2e394499f7153db8d62440c4dab0 Mon Sep 17 00:00:00 2001
Andrew Geissler595f6302022-01-24 19:11:47 +00002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 10 Nov 2020 16:33:27 +0000
Andrew Geissler6aa7eec2023-03-03 12:41:14 -06004Subject: [PATCH 8/9] src/cmd/dist/buildgo.go: do not hardcode host compilers
5 into target binaries
Andrew Geissler595f6302022-01-24 19:11:47 +00006
7These come from $CC/$CXX on the build host and are not useful on targets;
8additionally as they contain host specific paths, this helps reproducibility.
9
10Upstream-Status: Inappropriate [needs upstream discussion]
Patrick Williamsb58112e2024-03-07 11:16:36 -060011
Andrew Geissler595f6302022-01-24 19:11:47 +000012Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Patrick Williamsb58112e2024-03-07 11:16:36 -060013Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Andrew Geissler595f6302022-01-24 19:11:47 +000014---
15 src/cmd/dist/buildgo.go | 8 ++++----
16 1 file changed, 4 insertions(+), 4 deletions(-)
17
Andrew Geissler6aa7eec2023-03-03 12:41:14 -060018diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go
Patrick Williamsb58112e2024-03-07 11:16:36 -060019index 884e9d729a..2f52edacfe 100644
Andrew Geissler595f6302022-01-24 19:11:47 +000020--- a/src/cmd/dist/buildgo.go
21+++ b/src/cmd/dist/buildgo.go
Patrick Williamsb58112e2024-03-07 11:16:36 -060022@@ -51,8 +51,8 @@ func mkzdefaultcc(dir, file string) {
Andrew Geissler595f6302022-01-24 19:11:47 +000023 fmt.Fprintf(&buf, "package cfg\n")
24 fmt.Fprintln(&buf)
25 fmt.Fprintf(&buf, "const DefaultPkgConfig = `%s`\n", defaultpkgconfig)
26- buf.WriteString(defaultCCFunc("DefaultCC", defaultcc))
27- buf.WriteString(defaultCCFunc("DefaultCXX", defaultcxx))
28+ buf.WriteString(defaultCCFunc("DefaultCC", map[string]string{"":"gcc"}))
29+ buf.WriteString(defaultCCFunc("DefaultCXX", map[string]string{"":"g++"}))
30 writefile(buf.String(), file, writeSkipSame)
31 return
32 }
Patrick Williamsb58112e2024-03-07 11:16:36 -060033@@ -62,8 +62,8 @@ func mkzdefaultcc(dir, file string) {
Andrew Geissler595f6302022-01-24 19:11:47 +000034 fmt.Fprintf(&buf, "package main\n")
35 fmt.Fprintln(&buf)
36 fmt.Fprintf(&buf, "const defaultPkgConfig = `%s`\n", defaultpkgconfig)
37- buf.WriteString(defaultCCFunc("defaultCC", defaultcc))
38- buf.WriteString(defaultCCFunc("defaultCXX", defaultcxx))
39+ buf.WriteString(defaultCCFunc("defaultCC", map[string]string{"":"gcc"}))
40+ buf.WriteString(defaultCCFunc("defaultCXX", map[string]string{"":"g++"}))
41 writefile(buf.String(), file, writeSkipSame)
42 }
43
Andrew Geissler6aa7eec2023-03-03 12:41:14 -060044--
Patrick Williamsb58112e2024-03-07 11:16:36 -0600452.44.0
Andrew Geissler6aa7eec2023-03-03 12:41:14 -060046