Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 1 | From e0999902687e2e394499f7153db8d62440c4dab0 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 10 Nov 2020 16:33:27 +0000 |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame] | 4 | Subject: [PATCH 8/9] src/cmd/dist/buildgo.go: do not hardcode host compilers |
| 5 | into target binaries |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 6 | |
| 7 | These come from $CC/$CXX on the build host and are not useful on targets; |
| 8 | additionally as they contain host specific paths, this helps reproducibility. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [needs upstream discussion] |
Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 11 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 13 | Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 14 | --- |
| 15 | src/cmd/dist/buildgo.go | 8 ++++---- |
| 16 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 17 | |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame] | 18 | diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go |
Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 19 | index 884e9d729a..2f52edacfe 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 20 | --- a/src/cmd/dist/buildgo.go |
| 21 | +++ b/src/cmd/dist/buildgo.go |
Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 22 | @@ -51,8 +51,8 @@ func mkzdefaultcc(dir, file string) { |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 23 | 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 Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 33 | @@ -62,8 +62,8 @@ func mkzdefaultcc(dir, file string) { |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 34 | 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 Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame] | 44 | -- |
Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 45 | 2.44.0 |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame] | 46 | |