Mercurial > hg > release > icedtea6-1.6
changeset 1721:e6adbe29b4c4
Unset JAVA_HOME and JDK_HOME to avoid build failures.
2009-08-25 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Unset JAVA_HOME and JDK_HOME before building.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 18 Mar 2010 18:38:59 +0000 |
| parents | 47a2b1b5ef65 |
| children | 924928f21072 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 01 15:26:06 2010 +0000 +++ b/ChangeLog Thu Mar 18 18:38:59 2010 +0000 @@ -1,3 +1,8 @@ +2009-08-25 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Unset JAVA_HOME and JDK_HOME before building. + 2010-02-17 Andrew John Hughes <ahughes@redhat.com> * 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 @@ 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 @@ 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)"