OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR go/47452 (Bootstrap fails in libgo (argument has incompatible type))

Browse Source 
PR go/47452
Pick up local .gox files for specially built packages.

From-SVN: r169192
This commit is contained in:
Ian Lance Taylor 2011-01-25 05:45:21 +00:00
parent d62d06b6ff
commit 0544ed0caa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgo/Makefile.am
View File

@ -1439,7 +1439,7 @@ bufio/check: $(CHECK_DEPS)
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
$(LTGOCOMPILE) -I . -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
rm -f $@
$(AR) rc $@ bytes/bytes.$(OBJEXT) bytes/index.$(OBJEXT)
@ -1694,7 +1694,7 @@ strings/check: $(CHECK_DEPS)
sync/libsync.a: $(go_sync_files) $(go_sync_c_files) runtime.gox
test -d sync || $(MKDIR_P) sync
$(LTGOCOMPILE) -c -o sync/mutex.$(OBJEXT) -fgo-prefix=libgo_sync $(srcdir)/go/sync/mutex.go $(srcdir)/go/sync/once.go $(srcdir)/go/sync/rwmutex.go
$(LTGOCOMPILE) -I . -c -o sync/mutex.$(OBJEXT) -fgo-prefix=libgo_sync $(srcdir)/go/sync/mutex.go $(srcdir)/go/sync/once.go $(srcdir)/go/sync/rwmutex.go
$(LTCOMPILE) -c -o sync/cas.$(OBJEXT) $(srcdir)/go/sync/cas.c
rm -f $@
$(AR) rc $@ sync/mutex.$(OBJEXT) sync/cas.$(OBJEXT)
@ -2470,7 +2470,7 @@ syscalls/libsyscall.a: $(go_syscall_files) $(go_syscall_c_files) sync.gox
rm -f syscall.gox syscalls/libsyscall.a
test -d syscalls || $(MKDIR_P) syscalls
files=`echo $^ | sed -e 's/[^ ]*\.gox//g' -e's/[^ ]*\.c//g'`; \
$(LTGOCOMPILE) -c -fgo-prefix="libgo_syscalls" -o syscalls/syscall.$(OBJEXT) $$files
$(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_syscalls" -o syscalls/syscall.$(OBJEXT) $$files
$(LTCOMPILE) -c -o syscalls/errno.$(OBJEXT) $(srcdir)/syscalls/errno.c
$(AR) rc syscalls/libsyscall.a syscalls/syscall.$(OBJEXT) syscalls/errno.$(OBJEXT)
syscalls/libsyscall.la: syscalls/libsyscall.a

6
libgo/Makefile.in
View File

@ -3838,7 +3838,7 @@ bufio/check: $(CHECK_DEPS)
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
$(LTGOCOMPILE) -I . -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
rm -f $@
$(AR) rc $@ bytes/bytes.$(OBJEXT) bytes/index.$(OBJEXT)
@ -4093,7 +4093,7 @@ strings/check: $(CHECK_DEPS)
sync/libsync.a: $(go_sync_files) $(go_sync_c_files) runtime.gox
test -d sync || $(MKDIR_P) sync
$(LTGOCOMPILE) -c -o sync/mutex.$(OBJEXT) -fgo-prefix=libgo_sync $(srcdir)/go/sync/mutex.go $(srcdir)/go/sync/once.go $(srcdir)/go/sync/rwmutex.go
$(LTGOCOMPILE) -I . -c -o sync/mutex.$(OBJEXT) -fgo-prefix=libgo_sync $(srcdir)/go/sync/mutex.go $(srcdir)/go/sync/once.go $(srcdir)/go/sync/rwmutex.go
$(LTCOMPILE) -c -o sync/cas.$(OBJEXT) $(srcdir)/go/sync/cas.c
rm -f $@
$(AR) rc $@ sync/mutex.$(OBJEXT) sync/cas.$(OBJEXT)
@ -4869,7 +4869,7 @@ syscalls/libsyscall.a: $(go_syscall_files) $(go_syscall_c_files) sync.gox
rm -f syscall.gox syscalls/libsyscall.a
test -d syscalls || $(MKDIR_P) syscalls
files=`echo $^ | sed -e 's/[^ ]*\.gox//g' -e's/[^ ]*\.c//g'`; \
$(LTGOCOMPILE) -c -fgo-prefix="libgo_syscalls" -o syscalls/syscall.$(OBJEXT) $$files
$(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_syscalls" -o syscalls/syscall.$(OBJEXT) $$files
$(LTCOMPILE) -c -o syscalls/errno.$(OBJEXT) $(srcdir)/syscalls/errno.c
$(AR) rc syscalls/libsyscall.a syscalls/syscall.$(OBJEXT) syscalls/errno.$(OBJEXT)
syscalls/libsyscall.la: syscalls/libsyscall.a