Mercurial > hg > icedtea6

changeset 2234:00d9b2c78bc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make rt.jar update dependent on bootstrapping, not the existence of sun.awt.Toolkit. 2010-08-13 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Replace conditionals on LACKS_SUN_AWT_TOOLKIT with ones on BOOTSTRAPPING. If we are bootstrapping, we don't trust the system JDK and update rt.jar with newly built classes, regardless of whether it's an Oracle-based JDK or not. * configure.ac: Remove check for sun.awt.Toolkit.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 13 Aug 2010 20:00:48 +0100
parents c73c4672031a
children 552e98f1c215
files ChangeLog Makefile.am configure.ac
diffstat 3 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 10 14:52:56 2010 -0400
+++ b/ChangeLog	Fri Aug 13 20:00:48 2010 +0100
@@ -1,3 +1,14 @@
+2010-08-13  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Replace conditionals on LACKS_SUN_AWT_TOOLKIT
+	with ones on BOOTSTRAPPING.  If we are bootstrapping,
+	we don't trust the system JDK and update rt.jar
+	with newly built classes, regardless of whether it's
+	an Oracle-based JDK or not.
+	* configure.ac:
+	Remove check for sun.awt.Toolkit.
+
 2010-08-09  Omair Majid  <omajid@redhat.com>
 
 	* NEWS: Update with OpenType support.
--- a/Makefile.am	Tue Aug 10 14:52:56 2010 -0400
+++ b/Makefile.am	Fri Aug 13 20:00:48 2010 +0100
@@ -2068,7 +2068,7 @@
 	done
 
 stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
-if LACKS_SUN_AWT_TOOLKIT
+if BOOTSTRAPPING
 	mkdir -p lib/rt
 	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
           -sourcepath $(SOURCEPATH_DIRS) -bootclasspath \'\' \
@@ -2083,7 +2083,7 @@
 	rm -f stamps/rt-class-files.stamp
 	rm -f stamps/rt.stamp
 	rm -f rt-source-files.txt
-if LACKS_SUN_AWT_TOOLKIT
+if BOOTSTRAPPING
 	if [ -e $(ECJ_BOOT_DIR) ] ; then \
 	  cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar ; \
 	fi
@@ -2091,7 +2091,7 @@
 
 stamps/rt.stamp: stamps/rt-class-files.stamp
 	mkdir -p stamps
-if LACKS_SUN_AWT_TOOLKIT
+if BOOTSTRAPPING
 	$(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \
 	  -C lib/rt javax -C lib/rt sun 
 if ENABLE_NIO2
--- a/configure.ac	Tue Aug 10 14:52:56 2010 -0400
+++ b/configure.ac	Fri Aug 13 20:00:48 2010 +0100
@@ -178,7 +178,6 @@
 ENABLE_HG
 AC_CHECK_WITH_HG_REVISION
 AC_CHECK_WITH_TZDATA_DIR
-IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
 IT_GETDTDTYPE_CHECK
 IT_CHECK_XULRUNNER_VERSION