Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 1 | From 1cbb416538a9c7c3fbedcb23f4d90d5c48becca8 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] |
| 11 | Signed-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 Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 16 | diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go |
| 17 | index 29b0167..63a49f0 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 18 | --- a/src/cmd/dist/buildgo.go |
| 19 | +++ b/src/cmd/dist/buildgo.go |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 20 | @@ -33,8 +33,8 @@ func mkzdefaultcc(dir, file string) { |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 21 | 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 Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 31 | @@ -45,8 +45,8 @@ func mkzdefaultcc(dir, file string) { |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 32 | 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 Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 42 | -- |
| 43 | 2.30.2 |
| 44 | |