X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=1a28091729fe78433ad8721ff79eaa55c335605b;hb=da1d71c4ff94e14a942be31fc7a6e3a7f6c0f6f3;hp=28395cdf6a2c572fea6864d94adcc9500579990f;hpb=7ccf2a8b35954225ccff4fd056b146fcb5f539db;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 28395cd..1a28091 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -65,12 +65,12 @@ configure_gcc-3.3                       += --enable-languages=c,c++,java --enabl
 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))
+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
-endif
-ifneq ($(target),mips-unknown-elf)
 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
@@ -104,6 +104,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_%: