/hg/release/icedtea6-1.6: Unset JAVA_HOME and JDK_HOME to avoid ...

[andrew at icedtea.classpath.org]

changeset e6adbe29b4c4 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=e6adbe29b4c4
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 18 18:38:59 2010 +0000

	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, 9 insertions(+)
ChangeLog   |    5 +++++
Makefile.am |    4 ++++

diffs (33 lines):

diff -r 47a2b1b5ef65 -r e6adbe29b4c4 ChangeLog
--- a/ChangeLog	Mon Mar 01 15:26:06 2010 +0000
+++ b/ChangeLog	Thu Mar 18 18:38:59 2010 +0000
@@ -1,3 +1,8 @@ 2010-02-17 Andrew John Hughes  <ahughes@
+2009-08-25  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Unset JAVA_HOME and JDK_HOME before building.
+
 2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 47a2b1b5ef65 -r e6adbe29b4c4 Makefile.am
--- a/Makefile.am	Mon Mar 01 15:26:06 2010 +0000
+++ b/Makefile.am	Thu Mar 18 18:38:59 2010 +0000
@@ -193,6 +193,8 @@ ICEDTEA_ENV = \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
 	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
 	JAVAC="" \
+	JAVA_HOME="" \
+	JDK_HOME="" \
 	DISTRIBUTION_ID="$(DIST_ID)"
 
 if WITH_CACAO
@@ -278,6 +280,8 @@ ICEDTEA_ENV_ECJ = \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
 	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
 	JAVAC="" \
+	JAVA_HOME="" \
+	JDK_HOME="" \
 	JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
 	JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
 	JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)"