2003/09/13 05:05:42

darcs-hash:20040130073424-2ba56-1a0118219cf5745710608d9ec492f51fd91da565.gz

diff --git a/Makefile.upstream b/Makefile.upstream
index 61b48dc..d08a488 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
@@ -115,12 +115,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