2003/09/04 07:16:50

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

diff --git a/upstream/Makefile b/upstream/Makefile
index a77e6b9..46e1101 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -28,15 +28,21 @@ configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-new
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
 .jikes:
-       echo "jikes " > .jikes
-       (type jikes && (jikes --version | grep "Version 1.18")) || \
-               (make jikes-1.18/src jikes-1.18/.installed && echo -n "upstream/install/bin/jikes " > .jikes)
+       echo "#!/bin/sh" > .jikes
+       echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
+       echo -n 'PATH=$$PATH:upstream/install/bin/ jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+       (type jikes && (jikes --version | grep "Version 1.18")) || make jikes-1.18/src jikes-1.18/.installed
        echo -n "$(jikes_flags) -bootclasspath " >> .jikes
        echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
        echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }"  >> GetBootClassPath.java
        javac GetBootClassPath.java
        java -cp . GetBootClassPath >> .jikes
        rm GetBootClassPath.*
+       echo 'EXIT=$$?' >> .jikes
+       echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
+       echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
+       echo 'exit $$EXIT' >> .jikes
+       chmod +x .jikes
 
 # make the package's directory (if it doesn't exist)
 $(packages):
@@ -50,7 +56,7 @@ $(packages):
 $(packages:%=%-$(target)): %-$(target): %
        make $</src $</build-$(target)/.installed target=$(patsubst $<-%,%,$@)
 
-gcc-3.3-mips: binutils-2.13.2.1-mips
+gcc-3.3-$(target): binutils-2.13.2.1-$(target)
 
 # download the source code
 $(packages:%=%/src): %/src:
@@ -62,7 +68,7 @@ $(packages:%=%/src): %/src:
 
 # configure and build it
 setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))"
-$(packages:%=%/build-$(target)/.installed): %/build-$(target)/build-$(target)/.installed:
+$(packages:%=%/build-$(target)/.installed): %/build-$(target)/.installed:
        @mkdir -p $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target) install
        @echo -e "\nconfiguring $(patsubst %/build-$(target)/.installed,%,$@)..."
        cd $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target); $(setcc) ../src/configure --target=$(target) --prefix=`pwd`/../../install $(configure_$(patsubst %/build-$(target)/.installed,%,$@)) $(configure_$(patsubst %/build-$(target)/.installed,%,$@)-$(target))