X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile.upstream;h=fbbaa103eaeaeb9c9f057e1da56f34b4e82ab255;hb=ce46ffc931712d600b6f7ed4a426e4c1751ef4b9;hp=ab4047866eb9032ad8ba185bf3a752f306d07b3e;hpb=a41252ba1e0f5dd90100aa2064c011268809c038;p=org.ibex.core.git diff --git a/Makefile.upstream b/Makefile.upstream index ab40478..fbbaa10 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -217,8 +217,7 @@ endif @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 'PATH=upstream/install/bin:$$PATH $(shell pwd)/upstream/install/bin/i686-pc-linux-gnu-gcj -fCLASSPATH=lib/bcel-5.1.jar:lib/libgcj-minimal.jar:build/class -Ibuild/java/ -Iupstream/mips -Iupstream/mips/build -d build/class/ -C $$@' >> .jikes -# 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 + 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=