changeset in /hg/icedtea: Don't pass through JAVAC and unset JAV...

[gnu_andrew at member.fsf.org]

changeset 73a0824be76f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=73a0824be76f
description:
	Don't pass through JAVAC and unset JAVA_HOME.

diffstat:

3 files changed, 17 insertions(+), 8 deletions(-)
ChangeLog   |    7 +++++++
Makefile.am |   10 ++++++----
Makefile.in |    8 ++++----

diffs (94 lines):

diff -r 9b36b3114eec -r 73a0824be76f ChangeLog
--- a/ChangeLog	Mon May 26 20:28:23 2008 +0100
+++ b/ChangeLog	Mon May 26 21:49:39 2008 +0100
@@ -1,3 +1,10 @@ 2008-05-26  Andrew John Hughes  <gnu_and
+2008-05-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Don't pass JAVAC through to the OpenJDK
+	build and disable JAVA_HOME before building.
+	* Makefile.in: Regenerated.
+	
 2008-05-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 9b36b3114eec -r 73a0824be76f Makefile.am
--- a/Makefile.am	Mon May 26 20:28:23 2008 +0100
+++ b/Makefile.am	Mon May 26 21:49:39 2008 +0100
@@ -97,7 +97,8 @@ ICEDTEA_ENV = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -160,7 +161,8 @@ ICEDTEA_ENV_ECJ = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -614,7 +616,7 @@ icedtea: stamps/bootstrap-directory-syml
 icedtea: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp \
-	gcjwebplugin.so extra-lib/about.jar
+	gcjwebplugin.so extra-lib/about.jar env
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -671,7 +673,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+	stamps/ports-ecj.stamp stamps/patch-ecj.stamp env-ecj
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj \
diff -r 9b36b3114eec -r 73a0824be76f Makefile.in
--- a/Makefile.in	Mon May 26 20:28:23 2008 +0100
+++ b/Makefile.in	Mon May 26 21:49:39 2008 +0100
@@ -309,7 +309,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
 	$(am__append_2) $(am__append_3)
 
 # OpenJDK ecj build environment.
@@ -349,7 +349,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
 	$(am__append_5) $(am__append_6)
 
 # OpenJDK Source Preparation Targets
@@ -1085,7 +1085,7 @@ icedtea: stamps/bootstrap-directory-syml
 icedtea: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp \
-	gcjwebplugin.so extra-lib/about.jar
+	gcjwebplugin.so extra-lib/about.jar env
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -1142,7 +1142,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+	stamps/ports-ecj.stamp stamps/patch-ecj.stamp env-ecj
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj \