/hg/icedtea6: Unset JAVA_HOME and JDK_HOME to avoid build failures.

[andrew at icedtea.classpath.org]

changeset 9ef034b06fa2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9ef034b06fa2
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 27 11:54:41 2009 +0100

	Unset JAVA_HOME and JDK_HOME to avoid build failures.

	2009-08-25 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Unset JAVA_HOME and JDK_HOME before
	building.


diffstat:

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

diffs (41 lines):

diff -r 8353f4e67ec1 -r 9ef034b06fa2 ChangeLog
--- a/ChangeLog	Wed Aug 26 15:06:47 2009 -0400
+++ b/ChangeLog	Thu Aug 27 11:54:41 2009 +0100
@@ -1,3 +1,8 @@ 2009-08-26  Deepak Bhole <dbhole at redhat.
+2009-08-25  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Unset JAVA_HOME and JDK_HOME before building.
+
 2009-08-26  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
@@ -148,6 +153,7 @@ 2009-08-25  Deepak Bhole  <dbhole at redhat
 	(getInstance): Same.
 	(initializeExtensions): Provide unique key to getInstance.
 
+>>>>>>> other
 2009-08-21  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
diff -r 8353f4e67ec1 -r 9ef034b06fa2 Makefile.am
--- a/Makefile.am	Wed Aug 26 15:06:47 2009 -0400
+++ b/Makefile.am	Thu Aug 27 11:54:41 2009 +0100
@@ -183,6 +183,8 @@ ICEDTEA_ENV = \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
 	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
 	JAVAC="" \
+	JAVA_HOME="" \
+	JDK_HOME="" \
 	RHINO_JAR="$(RHINO_JAR)" \
 	DISTRIBUTION_ID="$(DIST_ID)"
 
@@ -264,6 +266,8 @@ ICEDTEA_ENV_ECJ = \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
 	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
 	JAVAC="" \
+	JAVA_HOME="" \
+	JDK_HOME="" \
 	RHINO_JAR="$(RHINO_JAR)" \
 	JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
 	JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \