From 992ff9ab3b57d939a7f279e01d4c94f3b3ddebaa Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Sun, 6 Mar 2005 19:48:10 +0000 Subject: [PATCH] re PR bootstrap/20155 (libgcj build fails with "execvp: /bin/sh: Argument list too long") PR libgcj/20155 * Makefile.am (libgcj0_convenience.la): Revert last change. * Makefile.in: Regenerate. From-SVN: r95984 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 15 --------------- libjava/Makefile.in | 16 +++------------- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0ce23c886d4..dd315eccf61 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-03-06 Roger Sayle + + PR libgcj/20155 + * Makefile.am (libgcj0_convenience.la): Revert last change. + * Makefile.in: Regenerate. + 2005-03-05 Anthony Green * jni/gtk-peer/gtk_jawt.c (classpath_jawt_get_drawable, diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 44e1b34377c..cd6f0b3aa64 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -226,9 +226,6 @@ libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc \ $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \ $(DARWIN_CRT_SRC) \ $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC) -libgcj0_convenience_la_LDFLAGS = -libgcj0_convenience_la_LIBADD = -libgcj0_convenience_la_LINK = $(LIBLINK) noinst_LTLIBRARIES = libgcj0_convenience.la libgcj_la_SOURCES = @@ -580,8 +577,6 @@ mostlyclean-local: clean-local: ## Remove every .class file that was created. find . -name '*.class' -print | xargs rm -f -## Remove every .objectlist file that was created. - find . -name '*.objectlist' -print | xargs rm -f distclean-local: ## Remove every .d file that was created. @@ -616,16 +611,6 @@ libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) $(libgcj_la_LIBADD) \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) -## Pass the list of object files to libtool in a temporary file to -## avoid tripping platform command line length limits. -libgcj0_convenience.la: $(libgcj0_convenience_la_OBJECTS) $(libgcj0_convenience_la_DEPENDENCIES) - @echo Creating list of files to link... - @: $(call write_entries_to_file,$(libgcj0_convenience_la_OBJECTS),libgcj0_convenience.objectlist) - $(libgcj0_convenience_la_LINK) \ - -objectlist libgcj0_convenience.objectlist \ - $(libgcj0_convenience_la_LIBADD) \ - -rpath $(toolexeclibdir) $(libgcj0_convenience_la_LDFLAGS) $(LIBS) - lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) @echo Creating list of files to link... @: $(call write_entries_to_file,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),lib_gnu_awt_xlib.objectlist) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 86285aa39ca..4e114c7dc97 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -329,7 +329,7 @@ am__DEPENDENCIES_2 = gnu/regexp/MessagesBundle.properties.lo \ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) am_libgcj_la_OBJECTS = libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS) -libgcj0_convenience_la_DEPENDENCIES = +libgcj0_convenience_la_LIBADD = am__libgcj0_convenience_la_SOURCES_DIST = prims.cc jni.cc exception.cc \ link.cc defineclass.cc interpret.cc verify.cc \ gnu/gcj/natCore.cc gnu/gcj/convert/JIS0208_to_Unicode.cc \ @@ -5173,9 +5173,6 @@ libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc \ $(DARWIN_CRT_SRC) \ $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC) -libgcj0_convenience_la_LDFLAGS = -libgcj0_convenience_la_LIBADD = -libgcj0_convenience_la_LINK = $(LIBLINK) noinst_LTLIBRARIES = libgcj0_convenience.la libgcj_la_SOURCES = nat_files = $(nat_source_files:.cc=.lo) @@ -16147,6 +16144,8 @@ sysdep/$(DEPDIR)/$(am__dirstamp): @: > sysdep/$(DEPDIR)/$(am__dirstamp) sysdep/dwarf2-backtrace.lo: sysdep/$(am__dirstamp) \ sysdep/$(DEPDIR)/$(am__dirstamp) +libgcj0_convenience.la: $(libgcj0_convenience_la_OBJECTS) $(libgcj0_convenience_la_DEPENDENCIES) + $(GCJLINK) $(libgcj0_convenience_la_LDFLAGS) $(libgcj0_convenience_la_OBJECTS) $(libgcj0_convenience_la_LIBADD) $(LIBS) libgij.la: $(libgij_la_OBJECTS) $(libgij_la_DEPENDENCIES) $(CXXLINK) -rpath $(toolexeclibdir) $(libgij_la_LDFLAGS) $(libgij_la_OBJECTS) $(libgij_la_LIBADD) $(LIBS) libjawt.la: $(libjawt_la_OBJECTS) $(libjawt_la_DEPENDENCIES) @@ -26670,7 +26669,6 @@ mostlyclean-local: clean-local: find . -name '*.class' -print | xargs rm -f - find . -name '*.objectlist' -print | xargs rm -f distclean-local: find . -name '*.d' -print | xargs rm -f @@ -26695,14 +26693,6 @@ libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) $(libgcj_la_LIBADD) \ -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) -libgcj0_convenience.la: $(libgcj0_convenience_la_OBJECTS) $(libgcj0_convenience_la_DEPENDENCIES) - @echo Creating list of files to link... - @: $(call write_entries_to_file,$(libgcj0_convenience_la_OBJECTS),libgcj0_convenience.objectlist) - $(libgcj0_convenience_la_LINK) \ - -objectlist libgcj0_convenience.objectlist \ - $(libgcj0_convenience_la_LIBADD) \ - -rpath $(toolexeclibdir) $(libgcj0_convenience_la_LDFLAGS) $(LIBS) - lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES) @echo Creating list of files to link... @: $(call write_entries_to_file,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),lib_gnu_awt_xlib.objectlist) -- 2.30.2