2003/09/16 00:37:38

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

diff --git a/Makefile.upstream b/Makefile.upstream
index d08a488..07e3185 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -61,7 +61,8 @@ configure_gcc-3.3                       += --disable-java-awt --disable-interpre
 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-powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+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
@@ -69,10 +70,12 @@ configure_gcc-3.3-mips-unknown-elf      := --enable-languages=c --nfp --enable-m
 
 # 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/$(target)/bin/gcc
+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)
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes