circumvent jikes if jdk

darcs-hash:20040215060732-5007d-ced2d5f9d552a759667aa248b0ba19536ee67a64.gz

diff --git a/Makefile b/Makefile
index 6752dc4..2e9572d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,9 @@ g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream
 gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
-gcj: .install_gcc-3.3_$(target); make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
+gcj: .install_gcc-3.3_$(target)
+       make compile
+       make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
 include Makefile.upstream
 
@@ -128,7 +130,7 @@ build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.jav
        mkdir -p build/class/org/ibex/util/
        ./.jikes $<
 
-oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -d build/class `find build/java/ -name \*.java`
+oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -source 1.2 -d build/class `find build/java/ -name \*.java`
 compile: .compile
 .compile: $(java_sources) .jikes .install_mips2java
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
@@ -195,7 +197,7 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 
-build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o
+build/$(platform)/$(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
        mkdir -p build/$(platform)
        PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib -Lupstream/install/lib $^ $(link_flags)

diff --git a/Makefile.upstream b/Makefile.upstream
index 50f471d..be8f405 100644 (file)
--- 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+