2003/09/26 03:21:29

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 1e9a941..a38cb91 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -4,8 +4,7 @@
 #
 
 # deal with Apple's brokenness
-setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))"
-setcc += PATH=`pwd`/upstream/install/bin:$$PATH
+setcc := $(shell test `uname` = Darwin && echo "CC=\"/usr/bin/gcc3 -no-cpp-precomp\"")
 
 # where to get stuff
 url_newlib-1.11.0      := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz
@@ -18,10 +17,13 @@ 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: .vendor
+       rm -rf upstream/darwin-linker/src
        cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz
+ifneq ($(shell uname),Darwin)
        cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done
        cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff
        cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; ../../links.sh
+endif
        make -C upstream/darwin-linker/src/cctools/libstuff
        make -C upstream/darwin-linker/src/cctools/misc
        touch upstream/darwin-linker/src/cctools/misc/makeUser.c upstream/darwin-linker/src/cctools/misc/make.h
@@ -46,25 +48,42 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ranlib powerpc-apple-darwin-ranlib
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip
        echo -e "#!/bin/sh\nc++filt \$$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3
+       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)
+.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)      
+       test -e upstream/install/bin/$(target)-ar || ln -s ../$(target)/bin/ar upstream/install/bin/$(target)-ar
+       test -e upstream/install/bin/$(target)-ranlib || ln -s ../$(target)/bin/ar upstream/install/bin/$(target)-ranlib
 
 # building newlib requires gcc
 .configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target)
 
 # how to configure it
-configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
+configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm
+configure_gcc-3.3                       += --disable-shared --disable-jvmpi
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
+ifneq ($(shell uname),$(platform))
 configure_gcc-3.3                       += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
 configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
-configure_gcc-3.3-powerpc-apple-darwin  := --enable-threads=posix --disable-hash-synchronization --disable-multilib
-configure_gcc-3.3-powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/powerpc-apple-darwin/include
-configure_gcc-3.3-i686-pc-mingw32       := --enable-threads=win32 --enable-hash-synchronization
-configure_gcc-3.3-i686-pc-linux-gnu     := --enable-threads=posix --enable-hash-synchronization
-configure_gcc-3.3-sparc-sun-solaris2.7  := --enable-threads=posix --disable-multilib
-configure_gcc-3.3-mips-unknown-elf      := --enable-languages=c --nfp --enable-multilib --disable-threads
+configure_gcc-3.3_powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+endif
+configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
+configure_gcc-3.3_i686-pc-mingw32       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-synchronization
+configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
+configure_gcc-3.3_sparc-sun-solaris2.7  += --enable-threads=posix --disable-multilib
+configure_gcc-3.3_mips-unknown-elf      += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
+configure_gcc-3.3_mips-unknown-elf      += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
+configure_gcc-3.3_mips-unknown-elf      += --enable-languages=c --nfp --enable-multilib --disable-threads
+
+# libjpeg's configury doesn't obey --target
+environment_jpeg-6b_$(target)           += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
+environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
+environment_jpeg-6b_$(target)           += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
+environment_jpeg-6b_$(target)           += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+
+environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bin:$$PATH
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
@@ -91,11 +110,11 @@ vendor: .vendor; @true
        @echo -e "\n\033[1mconfiguring $*...\033[0m"
        mkdir -p upstream/$*/build-$(target)
        cd upstream/$*/build-$(target); \
-               $(setcc) ../src/configure \
+               $(setcc) $(environment_$*_$(target)) ../src/configure \
                --target=$(target) \
                --prefix=`cd ../..; pwd`/install \
                $(configure_$*) \
-               $(configure_$*-$(target))
+               $(configure_$*_$(target))
        touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
@@ -105,9 +124,15 @@ vendor: .vendor; @true
 
 .install_%_$(target): .configure_%_$(target)
        @echo -e "\n\033[1mbuilding $*...\033[0m"
-       cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make
+       cd upstream/$*/build-$(target); \
+               $(setcc) PATH=$$PATH:`pwd`/../../install/bin \
+               $(environment_$*_$(target)) \
+               make $(setcc) $(environment_$*_$(target))
        @echo -e "\n\033[1minstalling $*...\033[0m"
-       cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
+       cd upstream/$*/build-$(target); \
+               $(setcc) PATH=$$PATH:`pwd`/../../install/bin \
+               $(environment_$*_$(target)) \
+               make install $(setcc) $(environment_$*_$(target))
        touch $@
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
@@ -115,8 +140,8 @@ vendor: .vendor; @true
        @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=$$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 install_jikes-1.18
+       echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .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
        echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }"  >> GetBootClassPath.java