2003/09/15 06:36:01

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 61b48dc..0078d65 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -4,7 +4,7 @@
 #
 
 # deal with Apple's brokenness
-setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))"
+setcc := $(shell test `uname` = Darwin && echo "CC=\"/usr/bin/gcc3 -no-cpp-precomp\"")
 
 # where to get stuff
 url_newlib-1.11.0      := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz
@@ -69,10 +69,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                     := AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
@@ -115,12 +117,12 @@ vendor: .vendor; @true
        cd upstream/$*/build-$(target); \
                $(setcc) PATH=$$PATH:`pwd`/../../install/bin \
                $(environment_$*_$(target)) \
-               make -e
+               make $(setcc) $(environment_$*_$(target))
        @echo -e "\n\033[1minstalling $*...\033[0m"
        cd upstream/$*/build-$(target); \
                $(setcc) PATH=$$PATH:`pwd`/../../install/bin \
                $(environment_$*_$(target)) \
-               make -e install
+               make install $(setcc) $(environment_$*_$(target))
        touch $@
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH