Mercurial > hg > icedtea12
changeset 2355:b363caf51669
Fix the --disable-bootstrap build by including netx.jar on the classpath for extra-class-files.
2010-12-08 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(extra-class-files): Depend on netx-dist
instead of netx, and include the NetX jar
on the bootclasspath.
* javac.in: Pass the memory options to javac
as done when --disable-bootstrap is enabled.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 08 Dec 2010 20:57:53 +0000 |
| parents | af3ba972e863 |
| children | 313adf325208 |
| files | ChangeLog Makefile.am javac.in |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 08 18:52:17 2010 +0000 +++ b/ChangeLog Wed Dec 08 20:57:53 2010 +0000 @@ -1,3 +1,12 @@ +2010-12-08 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (extra-class-files): Depend on netx-dist + instead of netx, and include the NetX jar + on the bootclasspath. + * javac.in: Pass the memory options to javac + as done when --disable-bootstrap is enabled. + 2010-12-08 Andrew John Hughes <ahughes@redhat.com> * javac.in:
--- a/Makefile.am Wed Dec 08 18:52:17 2010 +0000 +++ b/Makefile.am Wed Dec 08 20:57:53 2010 +0000 @@ -2079,11 +2079,11 @@ extra-source-files.txt: find $(abs_top_srcdir)/extra -name '*.java' | sort > $@ -stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp +stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx-dist.stamp mkdir -p extra-lib $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \ -sourcepath $(abs_top_srcdir)/extra \ - -bootclasspath $(RUNTIME) @extra-source-files.txt + -bootclasspath $(NETX_JAR):$(RUNTIME) @extra-source-files.txt cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';'
--- a/javac.in Wed Dec 08 18:52:17 2010 +0000 +++ b/javac.in Wed Dec 08 20:57:53 2010 +0000 @@ -20,7 +20,7 @@ push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar' unless grep {$_ eq '-bootclasspath'} @ARGV; my @ecj_parms = ($ECJ_WARNINGS, @bcoption); -my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source') +my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source', '-J-Xmx1024m') # Work around ecj's inability to handle duplicate command-line # options and unknown javac options.