/hg/icedtea6: Add shark alias when building zero with shark supp...

[doko at icedtea.classpath.org]

changeset 789ec2d452bd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=789ec2d452bd
author: doko at ubuntu.com
date: Mon Nov 22 04:51:01 2010 +0100

	Add shark alias when building zero with shark support on hotspot
	archs.

	Without the alias, -shark just gets ignored and defaults to the
	hotspot vm, which is unexpected.

	2010-11-22 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (stamps/add-zero.stamp): Add shark alias when
	building zero with shark support on hotspot archs.


diffstat:

2 files changed, 10 insertions(+)
ChangeLog   |    5 +++++
Makefile.am |    5 +++++

diffs (27 lines):

diff -r c3803fc3edac -r 789ec2d452bd ChangeLog
--- a/ChangeLog	Fri Nov 19 22:23:15 2010 +0000
+++ b/ChangeLog	Mon Nov 22 04:51:01 2010 +0100
@@ -1,3 +1,8 @@ 2010-11-19  Andrew John Hughes  <ahughes
+2010-11-22  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/add-zero.stamp): Add shark alias when building
+	zero with shark support on hotspot archs.
+
 2010-11-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r c3803fc3edac -r 789ec2d452bd Makefile.am
--- a/Makefile.am	Fri Nov 19 22:23:15 2010 +0000
+++ b/Makefile.am	Mon Nov 22 04:51:01 2010 +0100
@@ -1867,6 +1867,11 @@ else
 	cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_JRE_ARCH_DIR)/zero/
 	printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+if ADD_SHARK_BUILD
+	printf -- '-shark ALIASED_TO -zero\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+else
+	printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
 endif
 else
 	printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg