changeset in /hg/icedtea6: Allow a CACAO IcedTea to build normal...

[Andrew John Hughes]

changeset c926c9674b4c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c926c9674b4c
description:
	Allow a CACAO IcedTea to build normal IcedTea and OpenJDK
	to build IcedTea.

	2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Apply MEMORY_LIMIT setting to OpenJDK
		builds too and make sure limit is high enough
		on normal IcedTea builds to build with a CACAO IcedTea.

diffstat:

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

diffs (33 lines):

diff -r 173e3d40d94b -r c926c9674b4c ChangeLog
--- a/ChangeLog	Thu Oct 16 01:46:18 2008 +0100
+++ b/ChangeLog	Thu Oct 16 02:38:41 2008 +0100
@@ -1,3 +1,10 @@ 2008-10-16  Andrew John Hughes  <gnu_and
+2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Apply MEMORY_LIMIT setting to OpenJDK
+	builds too and make sure limit is high enough
+	on normal IcedTea builds to build with a CACAO IcedTea.
+	
 2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* acinclude.m4:
diff -r 173e3d40d94b -r c926c9674b4c Makefile.am
--- a/Makefile.am	Thu Oct 16 01:46:18 2008 +0100
+++ b/Makefile.am	Thu Oct 16 02:38:41 2008 +0100
@@ -932,13 +932,13 @@ clean-bootstrap-directory-symlink-ecj:
 # ===============
 
 if WITH_ICEDTEA
-if WITH_CACAO
   MEMORY_LIMIT = -J-Xmx1024m
 else
+if WITH_OPENJDK
   MEMORY_LIMIT = -J-Xmx512m
-endif
 else
   MEMORY_LIMIT =
+endif
 endif
 
 if WITH_CACAO