2003/09/03 06:39:41

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

diff --git a/upstream/Makefile b/upstream/Makefile
index 4aaed45..6f873e6 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -19,11 +19,11 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
 # how to configure it
 configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static
-configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization  # FIXME: can we enable hashsync?
+configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization
 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-mips                  := --nfp --with-newlib=yes --enable-multilib --disable-threads
 configure_gcc-3.3-sparc-sun-solaris2.7  := --enable-threads=posix --disable-multilib
+configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
 .jikes:
@@ -39,11 +39,11 @@ configure_gcc-3.3-sparc-sun-solaris2.7  := --enable-threads=posix --disable-mult
 
 # make the package's directory (if it doesn't exist)
 $(packages):
-       mkdir -p $<
+       mkdir -p $@
 
 # if the make target was specified in $(package)-$(target) format, break it apart and recurse
 $(packages:%=%-$(target)): %-$(target): %
-       make mkdirs $</src $</.installed target=$(patsubst $<-%,%,$@)
+       make $</src $</.installed target=$(patsubst $<-%,%,$@)
 
 # download the source code
 $(packages:%=%/src): %/src: %
@@ -54,15 +54,14 @@ $(packages:%=%/src): %/src: %
        @mv $</$< $</src
 
 # configure and build it
+setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))"
 $(packages:%=%/.installed): %/.installed: %
        @mkdir -p $</build-$(target) $</install
        @echo -e "\nconfiguring $<..."
-       cd $</build-$(target); \
-               CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(host)))" \
-               ../src/configure --prefix=`pwd`/../install $(configure_$<) $(configure_$<-$(target))
+       cd $</build-$(target); $(setcc) ../src/configure --prefix=`pwd`/../install $(configure_$<) $(configure_$<-$(target))
        @echo -e "\nbuilding $<..."
-       @cd $</build-$(target); make
+       @cd $</build-$(target); $(setcc) make
        @echo -e "\ninstalling $<..."
-       @cd $</build-$(target); make install
+       @cd $</build-$(target); $(setcc) make install
        @touch $</.installed