From dec2095c6328d39ce7f2c3b9e432aeb72d092ada Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Sat, 26 Jan 2013 18:01:34 -0700
Subject: [PATCH] fix openjdk bootimage cross builds

We need to extract the OpenJDK classes into the build classpath
directory for the target platform before running the
bootimage-generator, or else it won't be able to find the classes.
---
 makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index f006ba0bf9..46bbd9b8ff 100755
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-MAKEFLAGS = -s
+#MAKEFLAGS = -s
 
 name = avian
 version = 0.6
@@ -1158,7 +1158,8 @@ $(static-library): $(vm-objects) $(classpath-objects) $(vm-heapwalk-objects) \
 	$(ar) cru $(@) $(^)
 	$(ranlib) $(@)
 
-$(bootimage-object) $(codeimage-object): $(bootimage-generator)
+$(bootimage-object) $(codeimage-object): $(bootimage-generator) \
+		$(build)/classpath.jar
 	$(<) -cp $(classpath-build) -bootimage $(bootimage-object) -codeimage $(codeimage-object) \
 		-bootimage-symbols _binary_bootimage_bin_start:_binary_bootimage_bin_end \
 		-codeimage-symbols _binary_codeimage_bin_start:_binary_codeimage_bin_end