/hg/icedtea6: Use rt.jar for CACAO builds rather than the conten...

[andrew at icedtea.classpath.org]

changeset e1e9efa47cbe in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e1e9efa47cbe
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 01 21:20:35 2010 +0000

	Use rt.jar for CACAO builds rather than the contents of lib/rt.

	2010-03-01 Andrew John Hughes <ahughes at 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.


diffstat:

2 files changed, 10 insertions(+), 2 deletions(-)
ChangeLog   |    8 ++++++++
Makefile.am |    4 ++--

diffs (36 lines):

diff -r ccba25fc9759 -r e1e9efa47cbe ChangeLog
--- a/ChangeLog	Mon Mar 01 19:48:43 2010 +0000
+++ b/ChangeLog	Mon Mar 01 21:20:35 2010 +0000
@@ -1,3 +1,11 @@ 2010-03-01  Andrew John Hughes  <ahughes
+2010-03-01  Andrew John Hughes  <ahughes at 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 at redhat.com>
 
 	* Makefile.am:
diff -r ccba25fc9759 -r e1e9efa47cbe Makefile.am
--- a/Makefile.am	Mon Mar 01 19:48:43 2010 +0000
+++ b/Makefile.am	Mon Mar 01 21:20:35 2010 +0000
@@ -1863,7 +1863,7 @@ clean-visualvm:
 
 # CACAO
 
-stamps/cacao.stamp: $(OPENJDK_TREE) stamps/rt-class-files.stamp
+stamps/cacao.stamp: $(OPENJDK_TREE) stamps/rt.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao && \
@@ -1874,7 +1874,7 @@ if !USE_SYSTEM_CACAO
 	  --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) install
 	ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client