X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile.upstream;h=be8f40554cdd568bb2faa7830f666a1a15ede24e;hb=fa98aeae19fbc8eac531a94a44ac4a933adac411;hp=50f471d1bb01c8dee17f45f87823945b76e57d82;hpb=5de2077b86a41f6debd45ca1dd71666bf78b3975;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 50f471d..be8f405 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -226,6 +226,9 @@ endif
 .jikes:
 	@echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
 	echo "#!/bin/sh" > .jikes
+ifeq ($(shell javac -version 2>&1 | head -n 1),javac 1.5.0-beta)
+	echo -n 'PATH=upstream/install/bin:$$PATH javac -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src' >> .jikes
+else
 	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src ' >> .jikes
 	(type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target=
 	echo -n "$(jikes_flags) -bootclasspath " >> .jikes
@@ -234,6 +237,7 @@ endif
 	javac GetBootClassPath.java
 	java -cp . GetBootClassPath >> .jikes
 	rm GetBootClassPath.*
+endif
 	echo 'EXIT=$$?' >> .jikes
 	echo 'exit $$EXIT' >> .jikes
 	mv .jikes .jikes+