X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=upstream%2FMakefile;fp=upstream%2FMakefile;h=1003abdc4f4a5f369c09fd72ebd798377119d71c;hb=bccbf89a59fdf52d8833947bd798dbd8d75d3348;hp=c6d1e9647324449f63c48874530b178d5e0e4bc1;hpb=1c20383eb478d9f2f1a7936b278330a9df3967ee;p=org.ibex.core.git

diff --git a/upstream/Makefile b/upstream/Makefile
index c6d1e96..1003abd 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -28,15 +28,21 @@ configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-new
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
 .jikes:
-	echo "jikes " > .jikes
-	(type jikes && (jikes --version | grep "Version 1.18")) || \
-		(make jikes-1.18/src jikes-1.18/.installed && echo -n "upstream/install/bin/jikes " > .jikes)
+	echo "#!/bin/sh" > .jikes
+	echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
+	echo -n 'PATH=$$PATH:upstream/install/bin/ jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+	(type jikes && (jikes --version | grep "Version 1.18")) || make jikes-1.18/src jikes-1.18/.installed
 	echo -n "$(jikes_flags) -bootclasspath " >> .jikes
 	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
 	echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }"  >> GetBootClassPath.java
 	javac GetBootClassPath.java
 	java -cp . GetBootClassPath >> .jikes
 	rm GetBootClassPath.*
+	echo 'EXIT=$$?' >> .jikes
+	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
+	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
+	echo 'exit $$EXIT' >> .jikes
+	chmod +x .jikes
 
 # make the package's directory (if it doesn't exist)
 $(packages):