aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2013-11-14 18:07:31 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2013-11-14 18:07:31 +0000
commit9572918137e0b374c71c69c0c38b2adfacfbda1f (patch)
tree6a46d207d0152696c1c689e35d836d0e87223e05
parent6eeef4cc6780c010266ded53101cf22fc1b3ba1d (diff)
downloadgcc-9572918137e0b374c71c69c0c38b2adfacfbda1f.zip
gcc-9572918137e0b374c71c69c0c38b2adfacfbda1f.tar.gz
gcc-9572918137e0b374c71c69c0c38b2adfacfbda1f.tar.bz2
libgo/go/go/build: use syslist.go from the gc stdlib.
If cmd/go is rebuilt using -compiler gccgo the version of go/build that is linked into that cmd/go will not function properly as the list of file suffixes know as operating systems or architectures is incorrect. From-SVN: r204794
-rw-r--r--libgo/Makefile.am11
-rw-r--r--libgo/Makefile.in11
-rw-r--r--libgo/go/go/build/syslist.go8
3 files changed, 10 insertions, 20 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 5a0c9d7..489eafd 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1300,7 +1300,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 \
@@ -2777,15 +2777,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 6434bcf..20caeca 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1477,7 +1477,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 \
@@ -5144,15 +5144,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..f3ff5bb
--- /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 "