Hi, Recently, build.goosList and build.goarchList got fixed in mainline to be sensible, hard-coded, lists rather than odd autogenerated lists. This patch updates the 4.8 branch to match.
Cheers, mwh diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 957f23c..199b444 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1255,7 +1255,7 @@ go_go_build_files = \ go/go/build/build.go \ go/go/build/doc.go \ go/go/build/read.go \ - syslist.go + go/go/build/syslist.go go_go_doc_files = \ go/go/doc/comment.go \ go/go/doc/doc.go \ @@ -2713,15 +2713,6 @@ go/build/check: $(CHECK_DEPS) @$(CHECK) .PHONY: go/build/check -syslist.go: s-syslist; @true -s-syslist: Makefile - echo '// Generated automatically by make.' >syslist.go.tmp - echo 'package build' >>syslist.go.tmp - echo 'const goosList = "$(GOOS)"' >>syslist.go.tmp - echo 'const goarchList = "$(GOARCH)"' >>syslist.go.tmp - $(SHELL) $(srcdir)/../move-if-change syslist.go.tmp syslist.go - $(STAMP) $@ - @go_include@ go/doc.lo.dep go/doc.lo.dep: $(go_go_doc_files) $(BUILDDEPS) diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 706a72e..61cca73 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1447,7 +1447,7 @@ go_go_build_files = \ go/go/build/build.go \ go/go/build/doc.go \ go/go/build/read.go \ - syslist.go + go/go/build/syslist.go go_go_doc_files = \ go/go/doc/comment.go \ @@ -5071,15 +5071,6 @@ go/build/check: $(CHECK_DEPS) @$(CHECK) .PHONY: go/build/check -syslist.go: s-syslist; @true -s-syslist: Makefile - echo '// Generated automatically by make.' >syslist.go.tmp - echo 'package build' >>syslist.go.tmp - echo 'const goosList = "$(GOOS)"' >>syslist.go.tmp - echo 'const goarchList = "$(GOARCH)"' >>syslist.go.tmp - $(SHELL) $(srcdir)/../move-if-change syslist.go.tmp syslist.go - $(STAMP) $@ - @go_include@ go/doc.lo.dep go/doc.lo.dep: $(go_go_doc_files) $(BUILDDEPS) diff --git a/libgo/go/go/build/syslist.go b/libgo/go/go/build/syslist.go new file mode 100644 index 0000000..a322c88 --- /dev/null +++ b/libgo/go/go/build/syslist.go @@ -0,0 +1,8 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package build + +const goosList = "darwin dragonfly freebsd linux netbsd openbsd plan9 windows solaris " +const goarchList = "386 amd64 arm alpha m68k mipso32 mipsn32 mipsn64 mipso64 ppc ppc64 sparc sparc64 "