diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-05 22:15:05 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-05 22:15:05 +0000 |
| commit | 383b2177e71e752a69a567969de1c6acebfc46bb (patch) | |
| tree | a939a6149e0fc1f5e3bacf2bb5470b029f176471 /libjava | |
| parent | af2d2a298591f1fac53ef0feefa7c4018f8b44ca (diff) | |
| download | ppe42-gcc-383b2177e71e752a69a567969de1c6acebfc46bb.tar.gz ppe42-gcc-383b2177e71e752a69a567969de1c6acebfc46bb.zip | |
2002-06-05 H.J. Lu (hjl@gnu.org)
* Makefile.am (libgcj_convenience.la): Revert the last change.
(libgcj.la): Likewise.
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54295 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 12 | ||||
| -rw-r--r-- | libjava/Makefile.in | 7 |
3 files changed, 11 insertions, 14 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2c595c3a084..3b58ee78c96 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-06-05 H.J. Lu (hjl@gnu.org) + + * Makefile.am (libgcj_convenience.la): Revert the last change. + (libgcj.la): Likewise. + * Makefile.in: Regenerated. + 2002-06-04 H.J. Lu (hjl@gnu.org) * Makefile.am (libgcj_convenience.la): New target. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 2d713cabdfa..a959fdbba5e 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -222,16 +222,10 @@ $(javao_files) $(x_javao_files): %.lo: %.java $(GCJCOMPILE) -o $@ $< ## Pass the list of object files to libtool in a temporary file to -## avoid tripping platform command line length limits. We also use -## libgcj_convenience.la to avoid creating a long linker command line -## which causes problems on some OSes and makes it almost impossible to -## debug the linker under a debugger. -libgcj_convenience.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) +## avoid tripping platform command line length limits. +libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) @: $(shell echo Creating list of files to link...) $(shell rm -f libgcj.objectlist || :) $(shell touch libgcj.objectlist) $(foreach object,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),$(shell echo $(object) >> libgcj.objectlist)) - $(libgcj_la_LINK) -objectlist libgcj.objectlist - -libgcj.la: libgcj_convenience.la - $(libgcj_la_LINK) libgcj_convenience.la \ + $(libgcj_la_LINK) -objectlist libgcj.objectlist \ @GCLIBS@ @LIBFFI@ @ZLIBS@ \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 195208fe4a0..6c4a9001a84 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -3272,12 +3272,9 @@ $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h $(javao_files) $(x_javao_files): %.lo: %.java $(GCJCOMPILE) -o $@ $< -libgcj_convenience.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) +libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) @: $(shell echo Creating list of files to link...) $(shell rm -f libgcj.objectlist || :) $(shell touch libgcj.objectlist) $(foreach object,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),$(shell echo $(object) >> libgcj.objectlist)) - $(libgcj_la_LINK) -objectlist libgcj.objectlist - -libgcj.la: libgcj_convenience.la - $(libgcj_la_LINK) libgcj_convenience.la \ + $(libgcj_la_LINK) -objectlist libgcj.objectlist \ @GCLIBS@ @LIBFFI@ @ZLIBS@ \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) |
