2003/09/07 04:31:44

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 7819c74..914f7e3 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -16,8 +16,12 @@ url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
 
+.install_binutils-2.13.2.1_powerpc-apple-darwin:
+       ln -s upstream/install/bin/powerpc-apple-darwin-as /usr/bin/as
+       ln -s upstream/install/bin/powerpc-apple-darwin-ld /usr/bin/ld
+
 # building gcc requires binutils
-configure_gcc-3.3: install_binutils-2.13.2.1
+.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
 
 # how to configure it
 configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
@@ -49,7 +53,7 @@ vendor: .vendor; @true
        (test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
        touch $@
 
-.configure_%_$(target): download_% 
+.configure_%_$(target): .download_% 
        @echo -e "\n\033[1mconfiguring $*...\033[0m"
        mkdir -p upstream/$*/build-$(target)
        cd upstream/$*/build-$(target); \
@@ -60,15 +64,14 @@ vendor: .vendor; @true
                $(configure_$*-$(target))
        touch $@
 
-install_%: .install_%_$(target); @true
-.install_%_$(target): .configure_%
+.install_%_$(target): .configure_%_$(target)
        @echo -e "\n\033[1mbuilding $*...\033[0m"
        cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make
        @echo -e "\n\033[1minstalling $*...\033[0m"
        cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
        touch $@
 
-.install_freetype-2.1.4_$(target): download_freetype-2.1.4 install_binutils-2.13.2.1 install_gcc-3.3
+.install_freetype-2.1.4_$(target): .download_freetype-2.1.4_$(target) .install_binutils-2.13.2.1_$(target) .install_gcc-3.3_$(target)
        @echo -e "\n\033[1mbuilding freetype $*...\033[0m"
        cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../install/bin make CC=mips-gcc AR=mips-ar
        ../install/bin/mips-ranlib freetype-2.1.4/objs/libfreetype.a