--- a/ChangeLog	Fri Mar 19 13:19:46 2010 -0400
+++ b/ChangeLog	Fri Mar 19 17:46:05 2010 +0000
@@ -1,3 +1,10 @@
+2010-03-19  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_ENV_ECJ): Include ICEDTEA_ENV.
+	Remove duplication between ICEDTEA_ENV
+	and ICEDTEA_ENV_ECJ.
+
 2010-03-19  Deepak Bhole <dbhole@redhat.com>
 
 	* Makefile.am: Change IcedTeaPlugin.o -> IcedTeaNPPlugin.o
@@ -65,7 +72,7 @@
 
 	* plugin/icedteanp/IcedTeaNPPlugin.cc
 	(start_jvm_if_needed): Create pipes in a temporary dir instead of users
-	home directory. 
+	home directory.
 	(plugin_start_appletviewer): Pass pipe names to PluginMain when initializing Java.
 	* plugin/icedteanp/java/sun/applet/PluginMain.java: Receive pipe names
 	during initialization.

--- a/Makefile.am	Fri Mar 19 13:19:46 2010 -0400
+++ b/Makefile.am	Fri Mar 19 17:46:05 2010 +0000
@@ -496,95 +496,20 @@
 endif
 
 # OpenJDK ecj build environment.
-# FIXME (bootstrap): Remove duplication
-ICEDTEA_ENV_ECJ = \
-	ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
-	ANT="$(ANT)" \
-	BUILD_NUMBER="$(OPENJDK_VERSION)" \
-	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
-        JRE_RELEASE_VERSION="1.6.0_$(COMBINED_VERSION)" \
-	MILESTONE="fcs" \
+ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 	JAVA_TOOLS_DIR="$(ICEDTEA_BOOT_DIR)/bin" \
-	LANG="C" \
-	PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
-	ALT_BINARY_PLUGS_PATH="$(abs_top_builddir)/bootstrap/jdk1.7.0" \
-	ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
-	BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
 	ICEDTEA_RT="$(ICEDTEA_RT)" \
 	ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR_ECJ)" \
 	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \
-	ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \
-	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
 	BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
 	BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT)" \
-	CLASSPATH="" \
-	LD_LIBRARY_PATH="" \
 	GENSRCDIR="$(abs_top_builddir)/generated" \
-	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
-	SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
-	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
-	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
-	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
-	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
-	ZERO_ARCHFLAG="$(ARCHFLAG)" \
-	LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \
-	LIBFFI_LIBS="$(LIBFFI_LIBS)" \
-	LLVM_CFLAGS="$(LLVM_CFLAGS)" \
-	LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
-	LLVM_LIBS="$(LLVM_LIBS)" \
-	FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \
-	FT2_LIB="$(FREETYPE2_LIBS)" \
-	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)" \
-	DISTRIBUTION_ID="$(DIST_ID)" \
-	DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
-	DEBUG_CLASSFILES="true" \
-	DEBUG_BINARIES="true" \
 	DISABLE_NIMBUS="true" \
-	NO_DOCS="true" \
-	ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
-	VERBOSE="$(VERBOSE)" \
-	ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
-	ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect"
-
-if WITH_CACAO
-ICEDTEA_ENV_ECJ += \
-	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
-endif
-
-if DISABLE_OPTIMIZATIONS
-ICEDTEA_ENV_ECJ += \
-	NO_OPTIMIZATIONS="true" \
-	CC_NO_OPT="-O0 -g"
-endif
-
-if !ENABLE_DOCS
-ICEDTEA_ENV_ECJ += \
 	NO_DOCS="true"
-endif
-
-if ENABLE_CROSS_COMPILATION
-ICEDTEA_ENV_ECJ += \
-	CROSS_COMPILATION="true" \
-	CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)"
-endif
-
-if HAS_HOTSPOT_REVISION
-ICEDTEA_ENV_ECJ += \
-	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
-endif
-
-if WITH_RHINO
-ICEDTEA_ENV_ECJ += \
-	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
-endif
 
 # Source files
 # FIXME (distclean): Add generated file list