blob: fe830ce35c2f7c94fd0930ad14c9b4d5925d63f5 [file] [log] [blame]
Andrew Geissler6aa7eec2023-03-03 12:41:14 -06001From 1cbb416538a9c7c3fbedcb23f4d90d5c48becca8 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]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 src/cmd/dist/buildgo.go | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
Andrew Geissler6aa7eec2023-03-03 12:41:14 -060016diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go
17index 29b0167..63a49f0 100644
Andrew Geissler595f6302022-01-24 19:11:47 +000018--- a/src/cmd/dist/buildgo.go
19+++ b/src/cmd/dist/buildgo.go
Andrew Geissler6aa7eec2023-03-03 12:41:14 -060020@@ -33,8 +33,8 @@ func mkzdefaultcc(dir, file string) {
Andrew Geissler595f6302022-01-24 19:11:47 +000021 fmt.Fprintf(&buf, "package cfg\n")
22 fmt.Fprintln(&buf)
23 fmt.Fprintf(&buf, "const DefaultPkgConfig = `%s`\n", defaultpkgconfig)
24- buf.WriteString(defaultCCFunc("DefaultCC", defaultcc))
25- buf.WriteString(defaultCCFunc("DefaultCXX", defaultcxx))
26+ buf.WriteString(defaultCCFunc("DefaultCC", map[string]string{"":"gcc"}))
27+ buf.WriteString(defaultCCFunc("DefaultCXX", map[string]string{"":"g++"}))
28 writefile(buf.String(), file, writeSkipSame)
29 return
30 }
Andrew Geissler6aa7eec2023-03-03 12:41:14 -060031@@ -45,8 +45,8 @@ func mkzdefaultcc(dir, file string) {
Andrew Geissler595f6302022-01-24 19:11:47 +000032 fmt.Fprintf(&buf, "package main\n")
33 fmt.Fprintln(&buf)
34 fmt.Fprintf(&buf, "const defaultPkgConfig = `%s`\n", defaultpkgconfig)
35- buf.WriteString(defaultCCFunc("defaultCC", defaultcc))
36- buf.WriteString(defaultCCFunc("defaultCXX", defaultcxx))
37+ buf.WriteString(defaultCCFunc("defaultCC", map[string]string{"":"gcc"}))
38+ buf.WriteString(defaultCCFunc("defaultCXX", map[string]string{"":"g++"}))
39 writefile(buf.String(), file, writeSkipSame)
40 }
41
Andrew Geissler6aa7eec2023-03-03 12:41:14 -060042--
432.30.2
44