diff options
| author | Andrew Haley <aph@redhat.com> | 2009-04-28 09:35:22 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2009-04-28 09:35:22 +0000 |
| commit | a6524a7cb87acd44fe46ad544292708f2d85be52 (patch) | |
| tree | 7dc730c049d99def9063667c38a8af46b6570f99 /libjava/Makefile.am | |
| parent | 448ee6624d1ccc7626e13021c4d07db27d75a521 (diff) | |
| download | gcc-a6524a7cb87acd44fe46ad544292708f2d85be52.zip gcc-a6524a7cb87acd44fe46ad544292708f2d85be52.tar.gz gcc-a6524a7cb87acd44fe46ad544292708f2d85be52.tar.bz2 | |
re PR libgcj/39899 (gjdoc in 4.4.0 fails to build the libgcj documentation)
2009-04-28 Andrew Haley <aph@redhat.com>
PR libgcj/39899
* Makefile.am (libgcj_tools_la_LDFLAGS): Add
-fno-bootstrap-classes to libgcj_tools_la_GCJFLAGS.
* Makefile.in: Regenerate.
From-SVN: r146878
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 7db8a44..839d296 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -305,8 +305,15 @@ libgcj_la_LINK = $(LIBLINK) ## compiled. EXTRA_libgcj_la_SOURCES = java/lang/Object.java +# We compile libgcj_tools with -findirect-dispatch so that they can +# depend on external classes: in particular, gjdoc uses antlr. In +# addition, -fno-bootstrap-classes ensures that the tools are loaded +# by the system class loader rather than the bootstrap class loader: +# only core library classes should be loaded by the bootstrap loader. libgcj_tools_la_SOURCES = classpath/tools/tools.zip -libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst +libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \ + -fno-bootstrap-classes -fno-indirect-classes \ + -fsource-filename=$(here)/classpath/tools/all-classes.lst libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) |