X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=2224f5d9a880140ac8627cefdea6bf96b10f4817;hb=f4ff7c16a3b69784da7f66f6ff1be899b4a5f508;hp=9bcdf6f7eee6ee0ef74c2dd6f95cc9f44af7245a;hpb=6df08c52d9710948d2ab65914512c4cb07655bff;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 9bcdf6f..2224f5d 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -67,10 +67,9 @@ configure_gcc-3.3                       += --disable-java-awt --disable-interpre
 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
-endif
 configure_gcc-3.3                       += --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
@@ -103,6 +102,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_%: