X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=f4aad8f7a71570f329a20c1936212f6ad44f5cd3;hb=fd4cf59adec810b376f6a6ef264f9a76efa48b28;hp=d9f4d122c9695bc3f6b45cbd779499c3db67f347;hpb=220fdfe36b610a003eb9163949a8b2c78b6530fa;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index d9f4d12..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_%:
@@ -154,11 +154,14 @@ endif
 
 .install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@
 .install_gcc-3.3_mips-unknown-elf:           .install_mips2java; touch $@
-.install_mips2java:
+
+.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 -sf `cd ../..; pwd`/install
+
+.install_mips2java: .download_mips2java
 	(cd upstream/mips; make)
 	touch $@
 
@@ -194,7 +197,7 @@ endif
 .jikes:
 	@echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
 	echo "#!/bin/sh" > .jikes
-	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class:upstream/mips/build $$@ -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