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

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index cddcd2439e7f7643a1afb474f13abed5dbc3876b..838fec7227bd232519aa2a95203b9358b10ba970 100644 (file)
--- 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 4ccd863124c92d22d2dd3c187a0f8a876280e2be..6e2a2dcef03959c457a3c428606951d64890f7a0 100644 (file)
--- 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