Index: icedtea-2.5.4/Makefile.am
===================================================================
--- icedtea-2.5.4.orig/Makefile.am	2013-07-26 18:17:45.499466367 +0000
+++ icedtea-2.5.4/Makefile.am	2013-07-30 21:04:46.761410713 +0000
@@ -474,6 +474,12 @@
 	FT2_LIBS="$(FREETYPE2_LIBS)" \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
 	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
+	OE_CFLAGS="$(OE_CFLAGS)" \
+	OE_CPPFLAGS="$(OE_CPPFLAGS)" \
+	OE_CXXFLAGS="$(OE_CXXFLAGS)" \
+	OE_LDFLAGS="$(OE_LDFLAGS)" \
+	OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \
+	DISTRIBUTION_ID="$(DIST_ID)" \
 	QUIETLY="" \
 	ANT_RESPECT_JAVA_HOME="TRUE" \
 	DISTRIBUTION_ID="$(DIST_ID)" \
@@ -1777,8 +1783,8 @@
 	rm -f stamps/add-tzdata-support.stamp
 
 stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
-	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+	if [ -e $(abs_top_builddir)/bootstrap/jdk1.6.0/bin/java ] ; then \
+	  $(abs_top_builddir)/bootstrap/jdk1.6.0/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
 	fi
 	mkdir -p stamps
 	touch $@
@@ -2124,7 +2130,11 @@
 	cd jamvm/jamvm && \
 	LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
 	./autogen.sh --with-java-runtime-library=openjdk7 \
-	  --prefix=$(abs_top_builddir)/jamvm/install ; \
+	  --prefix=$(abs_top_builddir)/jamvm/install \
+	  --host=$(host_alias) \
+	  --build=$(build_alias) \
+	  --target=$(target_alias)  \
+	  --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
 	$(MAKE) ; \
 	$(MAKE) install
 	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
@@ -2189,6 +2199,7 @@
 	  --host=$(host_alias) \
 	  --build=$(build_alias) \
 	  --target=$(target_alias) \
+	  --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
 	  --prefix=$(abs_top_builddir)/cacao/install \
 	  --with-java-runtime-library=openjdk7 \
 	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
@@ -2256,7 +2267,7 @@
 # configure script arguments, quoted in single quotes
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ADD_ZERO_CONFIGURE_ARGS = \
-	--with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
+	--with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
 	--disable-bootstrap --enable-zero
 if ADD_SHARK_BUILD
 ADD_ZERO_CONFIGURE_ARGS += \
Index: icedtea-2.5.4/javac.in
===================================================================
--- icedtea-2.3.4.orig/javac.in	2013-07-24 21:33:57.224612327 +0000
+++ icedtea-2.5.4/javac.in	2013-07-30 19:41:56.240277496 +0000
@@ -77,5 +77,7 @@
     my @CLASSPATH = ('@ECJ_JAR@');
     push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
     $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
-    exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
+    # Compiling hotspot-tools consumes tons of memory and exceeds any default
+    # limits for jamvm and cacao.
+    exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
 }