diff options
| author | Tom Tromey <tromey@redhat.com> | 2004-09-28 20:37:40 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-09-28 20:37:40 +0000 |
| commit | bd1c8428dd2dd24c09db4c8ec42ab861a7ff11ee (patch) | |
| tree | 13b18b0839acaec87da7239413abadb82ead1b6d | |
| parent | 21ef99b8cab857be1b1aa547b7a02b5492f3d929 (diff) | |
| download | gcc-bd1c8428dd2dd24c09db4c8ec42ab861a7ff11ee.zip gcc-bd1c8428dd2dd24c09db4c8ec42ab861a7ff11ee.tar.gz gcc-bd1c8428dd2dd24c09db4c8ec42ab861a7ff11ee.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 9 | ||||
| -rw-r--r-- | libjava/Makefile.in | 9 |
3 files changed, 22 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3a60a56..9a2df00 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 543b488..1527cc5 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -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. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index bd831fe..c75bbda 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -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"; \ |