1*4882a593SmuzhiyunFrom 2055a46b396e272616c0b2273903e02c3b49a2ff Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alexander Kanavin <alex.kanavin@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 10 Nov 2020 16:33:27 +0000 4*4882a593SmuzhiyunSubject: [PATCH] src/cmd/dist/buildgo.go: do not hardcode host compilers into 5*4882a593Smuzhiyun target binaries 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunThese come from $CC/$CXX on the build host and are not useful on targets; 8*4882a593Smuzhiyunadditionally as they contain host specific paths, this helps reproducibility. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunUpstream-Status: Inappropriate [needs upstream discussion] 11*4882a593SmuzhiyunSigned-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun src/cmd/dist/buildgo.go | 8 ++++---- 14*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 4 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go 17*4882a593Smuzhiyunindex caafc13..4eb1c96 100644 18*4882a593Smuzhiyun--- a/src/cmd/dist/buildgo.go 19*4882a593Smuzhiyun+++ b/src/cmd/dist/buildgo.go 20*4882a593Smuzhiyun@@ -34,8 +34,8 @@ func mkzdefaultcc(dir, file string) { 21*4882a593Smuzhiyun fmt.Fprintf(&buf, "package cfg\n") 22*4882a593Smuzhiyun fmt.Fprintln(&buf) 23*4882a593Smuzhiyun fmt.Fprintf(&buf, "const DefaultPkgConfig = `%s`\n", defaultpkgconfig) 24*4882a593Smuzhiyun- buf.WriteString(defaultCCFunc("DefaultCC", defaultcc)) 25*4882a593Smuzhiyun- buf.WriteString(defaultCCFunc("DefaultCXX", defaultcxx)) 26*4882a593Smuzhiyun+ buf.WriteString(defaultCCFunc("DefaultCC", map[string]string{"":"gcc"})) 27*4882a593Smuzhiyun+ buf.WriteString(defaultCCFunc("DefaultCXX", map[string]string{"":"g++"})) 28*4882a593Smuzhiyun writefile(buf.String(), file, writeSkipSame) 29*4882a593Smuzhiyun return 30*4882a593Smuzhiyun } 31*4882a593Smuzhiyun@@ -46,8 +46,8 @@ func mkzdefaultcc(dir, file string) { 32*4882a593Smuzhiyun fmt.Fprintf(&buf, "package main\n") 33*4882a593Smuzhiyun fmt.Fprintln(&buf) 34*4882a593Smuzhiyun fmt.Fprintf(&buf, "const defaultPkgConfig = `%s`\n", defaultpkgconfig) 35*4882a593Smuzhiyun- buf.WriteString(defaultCCFunc("defaultCC", defaultcc)) 36*4882a593Smuzhiyun- buf.WriteString(defaultCCFunc("defaultCXX", defaultcxx)) 37*4882a593Smuzhiyun+ buf.WriteString(defaultCCFunc("defaultCC", map[string]string{"":"gcc"})) 38*4882a593Smuzhiyun+ buf.WriteString(defaultCCFunc("defaultCXX", map[string]string{"":"g++"})) 39*4882a593Smuzhiyun writefile(buf.String(), file, writeSkipSame) 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun 42