X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=f4aad8f7a71570f329a20c1936212f6ad44f5cd3;hb=8ca4611743688e14a46bdca18456eb44065f523b;hp=841493fdb44820f1e39bcdb679e1815147eba015;hpb=cb14cc93591e98c961b80a3beed20fe01a1b1d14;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 841493f..f4aad8f 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -110,8 +110,8 @@ endif
 	curl $(url_gcc-3.3) | tar xzf - -C upstream/gcc-3.3
 	mv upstream/gcc-3.3/gcc-3.3 upstream/gcc-3.3/src-darwin; true
 	mv upstream/gcc-3.3/libmspack upstream/gcc-3.3/src-darwin; true
-	(test -e upstream/gcc-3.3/patches && cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-	(test -e upstream/gcc-3.3/patches-darwin && cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
+	(cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
+	(cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
 	touch $@
 
 .download_%:
@@ -152,18 +152,17 @@ endif
 	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
-.install_mips2java:
+.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@
+.install_gcc-3.3_mips-unknown-elf:           .install_mips2java; touch $@
+
+.download_mips2java:
 	mkdir -p upstream/install
 	echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
 	cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
-	cd upstream/mips/upstream; ln -s `cd ../..; pwd`/install
-	make -C upstream/mips
-	touch $@
-
-.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java
-	touch $@
+	cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
 
-.install_gcc-3.3_mips-unknown-elf: .install_mips2java
+.install_mips2java: .download_mips2java
+	(cd upstream/mips; make)
 	touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4
@@ -198,8 +197,7 @@ endif
 .jikes:
 	@echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
 	echo "#!/bin/sh" > .jikes
-	#echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
-	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+	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
 	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
@@ -208,8 +206,6 @@ endif
 	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
 	mv .jikes .jikes+
 	cp .jikes+ .jikes