2003/10/16 18:37:28

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 2224f5d..ca7edf6 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -61,14 +61,20 @@ endif
 .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
-configure_gcc-3.3                       += --disable-shared --disable-jvmpi
+configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
+ifneq ($(platform),Solaris)
+configure_gcc-3.3                       += --disable-shared 
+else
+configure_gcc-3.3                       += --enable-shared 
+endif
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
 ifneq ($(shell uname),$(platform))
+ifneq ($(target),mips-unknown-elf)
 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                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 endif
+endif
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
 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
@@ -113,7 +119,7 @@ endif
        mkdir -p upstream/$*
        curl $(url_$*) | tar xzf - -C upstream/$*
        mv upstream/$*/$* upstream/$*/src; true
-       (test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
+       (test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
        touch $@
 
 .configure_%_$(target): .download_%