2004/01/17 23:07:20

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 3425855..841493f 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -54,16 +54,17 @@ endif
        cd upstream/install/powerpc-apple-darwin/bin; ln -sf ../../bin/c++filt3
        touch $@
 
-# building gcc requires binutils
-.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)      
 
 # how to configure it
 ifneq ($(shell uname),$(platform))
 configure_gcc-3.3                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 endif
 configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
-configure_gcc-3.3                       += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld --with-gnu-ld
-configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as --with-gnu-as
+configure_gcc-3.3                       += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
+configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
+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-shared --enable-static
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
@@ -103,24 +104,39 @@ ifeq ($(shell uname),Linux)
 endif
        touch .vendor
 
+.download_gcc-3.3_powerpc-apple-darwin:
+       @echo -e "\n\033[1mdownloading $*...\033[0m"
+       mkdir -p upstream/gcc-3.3
+       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
+       touch $@
+
 .download_%:
        @echo -e "\n\033[1mdownloading $*...\033[0m"
        mkdir -p upstream/$*
        curl $(url_$*) | tar xzf - -C upstream/$*
-ifeq ($(target),powerpc-apple-darwin)
-       mv upstream/$*/$* upstream/$*/src-darwin; true
-       mv upstream/$*/libmspack upstream/$*/src-darwin; true
-       (test -e upstream/$*/patches && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-       (test -e upstream/$*/patches-darwin && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-endif
-ifneq ($(target),powerpc-apple-darwin)
        mv upstream/$*/$* upstream/$*/src; true
        mv upstream/$*/libmspack upstream/$*/src; true
        (test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-endif
        touch $@
 
-.configure_%_$(target): .download_% 
+.configure_gcc-3.3_powerpc-apple-darwin: .download_gcc-3.3_powerpc-apple-darwin .install_binutils-2.13.2.1_powerpc-apple-darwin
+       @echo -e "\n\033[1mconfiguring gcc...\033[0m"
+       mkdir -p upstream/gcc-3.3/build-$(target)
+       cd upstream/gcc-3.3/build-$(target); \
+               $(setcc) $(environment_gcc-3.3_$(target)) ../src-darwin/configure \
+               --target=$(target) \
+               --prefix=`cd ../..; pwd`/install \
+               $(configure_gcc-3.3) \
+               $(configure_gcc-3.3_$(target))
+       touch $@
+
+.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
+
+.configure_%_$(target): .vendor .download_%
        @echo -e "\n\033[1mconfiguring $*...\033[0m"
        mkdir -p upstream/$*/build-$(target)
        cd upstream/$*/build-$(target); \