# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1421864245 0
# Node ID bf9210d67acb205eb669e76d24a20bd2c54f798c
# Parent  4795a4f25e491d80aed40039dd2667d710b31cff
PR2064: Unset OS before running OpenJDK build

2015-01-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR2064: Unset OS before running OpenJDK build
	* Makefile.am:
	(ICEDTEA_UNSET): Introduce variable to
	store unsetting of environment variables.
	(ICEDTEA_ENV): Move JAVAC, JAVA_HOME and
	JDK_HOME to ICEDTEA_UNSET.
	(icedtea): Unset variables prior to running
	$(MAKE).
	(icedtea-debug): Likewise.
	(icedtea-boot): Likewise.
	* NEWS: Updated.

diff -r 4795a4f25e49 -r bf9210d67acb ChangeLog
--- a/ChangeLog	Tue Jan 06 20:30:58 2015 +0000
+++ b/ChangeLog	Wed Jan 21 18:17:25 2015 +0000
@@ -1,3 +1,17 @@
+2015-01-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2064: Unset OS before running OpenJDK build
+	* Makefile.am:
+	(ICEDTEA_UNSET): Introduce variable to
+	store unsetting of environment variables.
+	(ICEDTEA_ENV): Move JAVAC, JAVA_HOME and
+	JDK_HOME to ICEDTEA_UNSET.
+	(icedtea): Unset variables prior to running
+	$(MAKE).
+	(icedtea-debug): Likewise.
+	(icedtea-boot): Likewise.
+	* NEWS: Updated.
+
 2015-01-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS:
diff -r 4795a4f25e49 -r bf9210d67acb Makefile.am
--- a/Makefile.am	Tue Jan 06 20:30:58 2015 +0000
+++ b/Makefile.am	Wed Jan 21 18:17:25 2015 +0000
@@ -450,6 +450,12 @@
 TEST_IN_BUILD=false
 endif
 
+ICEDTEA_UNSET = \
+	JAVAC= \
+	JAVA_HOME= \
+	JDK_HOME= \
+	OS=
+
 ICEDTEA_ENV = \
 	ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
 	ANT="$(ANT)" \
@@ -480,9 +486,6 @@
 	FT2_LIBS="$(FREETYPE2_LIBS)" \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
 	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
-	JAVAC="" \
-	JAVA_HOME="" \
-	JDK_HOME="" \
 	QUIETLY="" \
 	ANT_RESPECT_JAVA_HOME="TRUE" \
 	DISTRIBUTION_ID="$(DIST_ID)" \
@@ -1713,7 +1716,7 @@
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
  stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
  stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
-	$(ARCH_PREFIX) $(MAKE) -j1 \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_BUILD_TARGET)
@@ -1823,7 +1826,7 @@
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
  stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
  stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
-	$(ARCH_PREFIX) $(MAKE) -j1 \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_DEBUG_BUILD_TARGET)
@@ -1953,7 +1956,7 @@
 stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
  stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \
  stamps/rewrite-rhino.stamp stamps/jamvm.stamp stamps/generated.stamp
-	$(ARCH_PREFIX) $(MAKE) -j1 \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV_BOOT) \
 	  -C openjdk-boot \
 	  $(ICEDTEA_BUILD_TARGET)
diff -r 4795a4f25e49 -r bf9210d67acb NEWS
--- a/NEWS	Tue Jan 06 20:30:58 2015 +0000
+++ b/NEWS	Wed Jan 21 18:17:25 2015 +0000
@@ -103,6 +103,7 @@
   - S8066747: Backing out Japanese translation change in awt_ja.properties
   - S8067364, PR2145, RH114622: Printing to Postscript doesn't support dieresis
 * Bug fixes
+  - PR2064: Unset OS before running OpenJDK build
   - PR2069: Type-punning warnings still evident on RHEL 5
   - PR2094, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
   - PR2123: SunEC provider crashes when built using system NSS