circumvent jikes if jdk

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

diff --git a/Makefile.upstream b/Makefile.upstream
index c531107..be8f405 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -68,8 +68,9 @@ configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/insta
 ifneq ($(platform),Darwin)
 configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as
 endif
-configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
+configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-libgcj
 configure_gcc-3.3                       += --disable-shared --enable-static
+configure_binutils-2.13.2.1             += --disable-shared --enable-static
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
 configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-synchronization
 configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
@@ -225,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
@@ -233,6 +237,7 @@ endif
        javac GetBootClassPath.java
        java -cp . GetBootClassPath >> .jikes
        rm GetBootClassPath.*
+endif
        echo 'EXIT=$$?' >> .jikes
        echo 'exit $$EXIT' >> .jikes
        mv .jikes .jikes+