unbroke the non-native builds

[org.ibex.core.git] / Makefile.upstream

diff --git a/Makefile.upstream b/Makefile.upstream
index ab40478..fbbaa10 100644 (file)
--- 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=