Mercurial > hg > release > icedtea7-2.0
changeset 2192:104a9313e4d8
Use rt.jar for CACAO builds rather than the contents of lib/rt.
2010-03-01 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(stamps/cacao.stamp): Depend on rt.stamp
and use updated rt.jar to build against rather
than the contents of lib/rt, so that --with-openjdk
builds work.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 01 Jun 2010 15:47:49 +0100 |
| parents | 898c5cdf9448 |
| children | 3c79ac98c366 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 01 15:43:47 2010 +0100 +++ b/ChangeLog Tue Jun 01 15:47:49 2010 +0100 @@ -1,3 +1,11 @@ +2010-03-01 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (stamps/cacao.stamp): Depend on rt.stamp + and use updated rt.jar to build against rather + than the contents of lib/rt, so that --with-openjdk + builds work. + 2010-03-01 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Tue Jun 01 15:43:47 2010 +0100 +++ b/Makefile.am Tue Jun 01 15:47:49 2010 +0100 @@ -2375,7 +2375,7 @@ # CACAO -stamps/cacao.stamp: stamps/rt-class-files.stamp +stamps/cacao.stamp: stamps/rt.stamp if BUILD_CACAO if !USE_SYSTEM_CACAO cd cacao/cacao && \ @@ -2386,7 +2386,7 @@ --prefix=$(abs_top_builddir)/cacao/install \ --with-java-runtime-library=openjdk \ --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ - --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \ + --with-java-runtime-library-classes=$(ICEDTEA_RT) \ --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client