re PR libgcj/17222 (libjava fails to build due to command line length during link)

PR libgcj/17222:
	* Makefile.am (libgcj.la): Restored.
	* Makefile.in: Rebuilt.

From-SVN: r88251
This commit is contained in:
Tom Tromey 2004-09-28 20:37:40 +00:00 committed by Tom Tromey
parent 21ef99b8ca
commit bd1c8428dd
3 changed files with 22 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2004-09-28 Tom Tromey <tromey@redhat.com>
PR libgcj/17222:
* Makefile.am (libgcj.la): Restored.
* Makefile.in: Rebuilt.
2004-09-28 Michael Koch <konqueror@gmx.de>
* java/net/URLConnection.java: Reformatted.

View File

@ -211,6 +211,15 @@ libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \
java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \
$(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
## Pass the list of object files to libtool in a temporary file to
## avoid tripping platform command line length limits.
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
@echo Creating list of files to link...
@: $(call write_entries_to_file,$(libgcj_la_OBJECTS),libgcj.objectlist)
$(libgcj_la_LINK) -objectlist libgcj.objectlist \
$(libgcj_la_LIBADD) \
-rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
## The mysterious backslash in the grep pattern is consumed by make.

View File

@ -13955,8 +13955,6 @@ sysdep/$(DEPDIR)/$(am__dirstamp):
@: > sysdep/$(DEPDIR)/$(am__dirstamp)
sysdep/dwarf2-backtrace.lo: sysdep/$(am__dirstamp) \
sysdep/$(DEPDIR)/$(am__dirstamp)
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
$(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS)
libgij.la: $(libgij_la_OBJECTS) $(libgij_la_DEPENDENCIES)
$(CXXLINK) -rpath $(toolexeclibdir) $(libgij_la_LDFLAGS) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@ -23143,6 +23141,13 @@ uninstall-info: uninstall-info-recursive
uninstall-toolexecmainlibDATA
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
@echo Creating list of files to link...
@: $(call write_entries_to_file,$(libgcj_la_OBJECTS),libgcj.objectlist)
$(libgcj_la_LINK) -objectlist libgcj.objectlist \
$(libgcj_la_LIBADD) \
-rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)
$(gtk_jni_headers): $(gtk_awt_peer_sources)
@input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \
echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \