/hg/icedtea6: Define RUNTIME conditionally to handle jsse.jar co...

[andrew at icedtea.classpath.org]

changeset afdd3f284524 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=afdd3f284524
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Oct 18 21:29:09 2010 +0100

	Define RUNTIME conditionally to handle jsse.jar correctly.

	2010-10-18 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (RUNTIME): Define conditionally, so
	that jsse.jar is added when not bootstrapping.


diffstat:

2 files changed, 8 insertions(+), 1 deletion(-)
ChangeLog   |    6 ++++++
Makefile.am |    3 ++-

diffs (37 lines):

diff -r b2629d02d55f -r afdd3f284524 ChangeLog
--- a/ChangeLog	Mon Oct 18 20:14:50 2010 +0100
+++ b/ChangeLog	Mon Oct 18 21:29:09 2010 +0100
@@ -1,3 +1,9 @@ 2010-10-18  Andrew John Hughes  <ahughes
+2010-10-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(RUNTIME): Define conditionally, so that
+	jsse.jar is added when not bootstrapping.
+
 2010-10-18  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r b2629d02d55f -r afdd3f284524 Makefile.am
--- a/Makefile.am	Mon Oct 18 20:14:50 2010 +0100
+++ b/Makefile.am	Mon Oct 18 21:29:09 2010 +0100
@@ -34,7 +34,6 @@ ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/cl
 ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
 BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
-RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
 ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
 ECJ_BOOT_DIR = $(abs_top_builddir)/bootstrap/ecj
 ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
@@ -190,10 +189,12 @@ if BOOTSTRAPPING
   BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
   ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR)
   INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
+  RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
 else
   BOOTSTRAP_DIRECTORY_STAMP =
   ICEDTEA_HOME = $(SYSTEM_JDK_DIR)
   INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
+  RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar
 endif
 
 if CP_SUPPORTS_REFLINK