aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2011-01-05 14:12:37 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2011-01-05 14:12:37 +0000
commitcd656e236051edd0e84bbadea2d8bd174d604d08 (patch)
tree8d6f882c1d43d50360e1fef235f54bd1f08b90e6
parentf626b979b1a853abcda785c3bfe26ff9525b3685 (diff)
downloadgcc-cd656e236051edd0e84bbadea2d8bd174d604d08.zip
gcc-cd656e236051edd0e84bbadea2d8bd174d604d08.tar.gz
gcc-cd656e236051edd0e84bbadea2d8bd174d604d08.tar.bz2
re PR go/47176 (libgo doesn't compile if libunicode is installed)
PR go/47176 byte/libbytes.a depends on unicode.gox. From-SVN: r168512
-rw-r--r--libgo/Makefile.am3
-rw-r--r--libgo/Makefile.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index cddcd24..838fec7 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1366,7 +1366,8 @@ bufio/check: $(CHECK_DEPS)
$(CHECK)
.PHONY: bufio/check
-bytes/libbytes.a: $(go_bytes_files) $(go_bytes_c_files) io.gox os.gox utf8.gox
+bytes/libbytes.a: $(go_bytes_files) $(go_bytes_c_files) io.gox os.gox \
+ unicode.gox utf8.gox
test -d bytes || $(MKDIR_P) bytes
$(LTGOCOMPILE) -c -o bytes/bytes.$(OBJEXT) -fgo-prefix=libgo_bytes $(srcdir)/go/bytes/buffer.go $(srcdir)/go/bytes/bytes.go $(srcdir)/go/bytes/bytes_decl.go
$(LTCOMPILE) -c -o bytes/index.$(OBJEXT) $(srcdir)/go/bytes/indexbyte.c
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 4ccd863..6e2a2dc 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -3638,7 +3638,8 @@ bufio/check: $(CHECK_DEPS)
$(CHECK)
.PHONY: bufio/check
-bytes/libbytes.a: $(go_bytes_files) $(go_bytes_c_files) io.gox os.gox utf8.gox
+bytes/libbytes.a: $(go_bytes_files) $(go_bytes_c_files) io.gox os.gox \
+ unicode.gox utf8.gox
test -d bytes || $(MKDIR_P) bytes
$(LTGOCOMPILE) -c -o bytes/bytes.$(OBJEXT) -fgo-prefix=libgo_bytes $(srcdir)/go/bytes/buffer.go $(srcdir)/go/bytes/bytes.go $(srcdir)/go/bytes/bytes_decl.go
$(LTCOMPILE) -c -o bytes/index.$(OBJEXT) $(srcdir)/go/bytes/indexbyte.c