diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-28 20:37:40 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-28 20:37:40 +0000 |
| commit | 2e61db8925d2c5862d9b5b9a865adc664f675709 (patch) | |
| tree | 13b18b0839acaec87da7239413abadb82ead1b6d /libjava | |
| parent | 62434574df88bd0f5aa905013cd8c7f89a3fcf53 (diff) | |
| download | gcc-2e61db8925d2c5862d9b5b9a865adc664f675709.tar.gz | |
PR libgcj/17222:
* Makefile.am (libgcj.la): Restored.
* Makefile.in: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88251 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 3a60a56f84c..9a2df007b0b 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 543b48879f5..1527cc55211 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 bd831fea3e5..c75bbda0f24 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"; \ |