diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-01-25 05:45:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-01-25 05:45:21 +0000 |
| commit | 0544ed0caad36b3ec9df997932375e49eb63a4d2 (patch) | |
| tree | e1de684b2d183cb70f458d98a6e5f9895278c8ef /libgo | |
| parent | d62d06b6ff7c4b43cd84055f76e27c1f0bafa99d (diff) | |
| download | gcc-0544ed0caad36b3ec9df997932375e49eb63a4d2.zip gcc-0544ed0caad36b3ec9df997932375e49eb63a4d2.tar.gz gcc-0544ed0caad36b3ec9df997932375e49eb63a4d2.tar.bz2 | |
re PR go/47452 (Bootstrap fails in libgo (argument has incompatible type))
PR go/47452
Pick up local .gox files for specially built packages.
From-SVN: r169192
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/Makefile.am | 6 | ||||
| -rw-r--r-- | libgo/Makefile.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 0ed2d63..0a3e9d3 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -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 diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 36a6850..9647b31 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -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 |