From 86a7c85f83895d54a00d79e3cd0356c11de3a589 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sun, 1 Mar 2015 19:42:03 -0500 Subject: [PATCH] cmd/dist: fix default GOOS/GOARCH for cross-compile Before this CL, if you are on a darwin/amd64 machine and cross-compile 9g for a linux/ppc64 machine, when you copy 9g over to that kind of machine and run it, you'll find it thinks the default object target is darwin/amd64. Not useful. Make the default target linux/ppc64 in this case. More useful. Change-Id: I62f2e9cb5f60b3077a922b31cd023a9cb7a6cfda Reviewed-on: https://go-review.googlesource.com/6407 Reviewed-by: Rob Pike --- src/cmd/dist/buildruntime.go | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/cmd/dist/buildruntime.go b/src/cmd/dist/buildruntime.go index 112326558a7..73f4d8eaf16 100644 --- a/src/cmd/dist/buildruntime.go +++ b/src/cmd/dist/buildruntime.go @@ -40,27 +40,38 @@ func mkzversion(dir, file string) { // const defaultGOROOT = // const defaultGO386 = // const defaultGOARM = -// const defaultGOOS = -// const defaultGOARCH = +// const defaultGOOS = runtime.GOOS +// const defaultGOARCH = runtime.GOARCH // const defaultGO_EXTLINK_ENABLED = // const version = // const goexperiment = // +// The use of runtime.GOOS and runtime.GOARCH makes sure that +// a cross-compiled compiler expects to compile for its own target +// system. That is, if on a Mac you do: +// +// GOOS=linux GOARCH=ppc64 go build cmd/9g +// +// the resulting compiler will default to generating linux/ppc64 object files. +// This is more useful than having it default to generating objects for the +// original target (in this example, a Mac). func mkzbootstrap(file string) { out := fmt.Sprintf( "// auto generated by go tool dist\n"+ "\n"+ "package obj\n"+ "\n"+ + "import \"runtime\"\n"+ + "\n"+ "const defaultGOROOT = `%s`\n"+ "const defaultGO386 = `%s`\n"+ "const defaultGOARM = `%s`\n"+ - "const defaultGOOS = `%s`\n"+ - "const defaultGOARCH = `%s`\n"+ + "const defaultGOOS = runtime.GOOS\n"+ + "const defaultGOARCH = runtime.GOARCH\n"+ "const defaultGO_EXTLINK_ENABLED = `%s`\n"+ "const version = `%s`\n"+ "const goexperiment = `%s`\n", - goroot_final, go386, goarm, gohostos, gohostarch, goextlinkenabled, findgoversion(), os.Getenv("GOEXPERIMENT")) + goroot_final, go386, goarm, goextlinkenabled, findgoversion(), os.Getenv("GOEXPERIMENT")) writefile(out, file, 0) }