X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=ca7edf64a14982d023104287d605f38578b625a8;hp=aa3ae0754fd4654750af0904d4369b5298afe396;hb=a3f21c96296264d756cddbb2bcbb8f8d8e08efe7;hpb=d7955902243a04551f75b0f14d0583a61f3d31b4

diff --git a/Makefile.upstream b/Makefile.upstream
index aa3ae07..ca7edf6 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -61,16 +61,21 @@ 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_powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+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       += --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
@@ -103,6 +108,10 @@ vendor: .vendor; @true
 	mkdir -p upstream/install/i686-pc-mingw32
 	curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
 	curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
+ifeq ($(shell uname),Linux)
+	rm -rf upstream/install/i686-pc-linux-gnu/include
+	ln -sf /usr/include upstream/install/i686-pc-linux-gnu/include
+endif
 	touch .vendor
 
 .download_%:
@@ -110,7 +119,7 @@ vendor: .vendor; @true
 	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_%