circumvent jikes if jdk

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 5fc5417..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
@@ -82,12 +83,14 @@ configure_WindowMaker-0.80.2_$(target)  += --host=i686-pc-linux-gnu --x-librarie
 
 configure_jode-1.1.1_java               := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac
 ifeq ($(shell uname),Darwin)
-environment_jode-1.1.1_java             := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.1/Classes/classes.jar
+environment_jode-1.1.1_java             := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar
 else
 environment_jode-1.1.1_java             := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar
 endif
 environment_jode-1.1.1_java             += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/
 
+#environment_gcc-3.3_i686-pc-linux-gnu   += CFLAGS="-Wl,-ldl"
+
 # libjpeg's configury doesn't obey --target
 environment_jpeg-6b_$(target)           += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
 environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
@@ -106,7 +109,7 @@ environment_WindowMaker-0.80.2_$(target) += PATH=$(shell pwd)/upstream/install/$
 environment_WindowMaker-0.80.2_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
 environment_WindowMaker-0.80.2_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar"
 environment_WindowMaker-0.80.2_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
-environment_WindowMaker-0.80.2_$(target) += LDFLAGS="-lXext"
+environment_WindowMaker-0.80.2_$(target) += LDFLAGS="-lXext -ldl"
 make_install_WindowMaker-0.80.2_$(target) := -C WINGs install; make -C wrlib
 make_WindowMaker-0.80.2_$(target) := WINGs
 
@@ -124,8 +127,7 @@ vendor: .vendor; @true
        curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
        curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
 ifeq ($(shell uname),Linux)
-       rm -rf upstream/install/i686-pc-linux-gnu/include
-       ln -sf /usr/include upstream/install/i686-pc-linux-gnu/include
+       cd upstream/install/i686-pc-linux-gnu/include; rm -rf *; ln -sf /usr/include/* .
 endif
        touch .vendor
 
@@ -224,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
@@ -232,6 +237,7 @@ endif
        javac GetBootClassPath.java
        java -cp . GetBootClassPath >> .jikes
        rm GetBootClassPath.*
+endif
        echo 'EXIT=$$?' >> .jikes
        echo 'exit $$EXIT' >> .jikes
        mv .jikes .jikes+