2003/09/04 02:26:46

darcs-hash:20040130070436-2ba56-edb988a85b55ac587f11814b988348239edc11ae.gz

diff --git a/upstream/Makefile b/upstream/Makefile
index 6f873e6..a77e6b9 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -19,6 +19,7 @@ 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                       += --with-gnu-ld --with-gnu-as
 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
@@ -29,7 +30,7 @@ configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-new
 .jikes:
        echo "jikes " > .jikes
        (type jikes && (jikes --version | grep "Version 1.18")) || \
-               (make jikes-1.18/src jikes-1.18/.installed && echo -n "upstream/jikes-1.18/install/bin/jikes " > .jikes)
+               (make jikes-1.18/src jikes-1.18/.installed && echo -n "upstream/install/bin/jikes " > .jikes)
        echo -n "$(jikes_flags) -bootclasspath " >> .jikes
        echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
        echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }"  >> GetBootClassPath.java
@@ -39,29 +40,35 @@ configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-new
 
 # make the package's directory (if it doesn't exist)
 $(packages):
-       mkdir -p $@
+       mkdir -p $@ install
+
+.headers:
+       curl http://www.megacz.com/upstream.tgz | tar xzf - -C upstream/install
+       touch .headers
 
 # if the make target was specified in $(package)-$(target) format, break it apart and recurse
 $(packages:%=%-$(target)): %-$(target): %
-       make $</src $</.installed target=$(patsubst $<-%,%,$@)
+       make $</src $</build-$(target)/.installed target=$(patsubst $<-%,%,$@)
+
+gcc-3.3-mips: binutils-2.13.2.1-mips
 
 # download the source code
-$(packages:%=%/src): %/src: %
-       @echo -e "\ndownloading $<..."
-       @mkdir -p $<
-       @curl $(url_$<) | tar xzf - -C $<
-       (test -e $</patches && cd $</$< && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
-       @mv $</$< $</src
+$(packages:%=%/src): %/src:
+       @echo -e "\ndownloading $(patsubst %/src,%,$@)..."
+       @mkdir -p $(patsubst %/src,%,$@)
+       @curl $(url_$(patsubst %/src,%,$@)) | tar xzf - -C $(patsubst %/src,%,$@)
+       (test -e $(patsubst %/src,%,$@)/patches && cd $(patsubst %/src,%,$@)/$(patsubst %/src,%,$@) && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
+       @mv $(patsubst %/src,%,$@)/$(patsubst %/src,%,$@) $(patsubst %/src,%,$@)/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); $(setcc) ../src/configure --prefix=`pwd`/../install $(configure_$<) $(configure_$<-$(target))
-       @echo -e "\nbuilding $<..."
-       @cd $</build-$(target); $(setcc) make
-       @echo -e "\ninstalling $<..."
-       @cd $</build-$(target); $(setcc) make install
-       @touch $</.installed
+$(packages:%=%/build-$(target)/.installed): %/build-$(target)/build-$(target)/.installed:
+       @mkdir -p $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target) install
+       @echo -e "\nconfiguring $(patsubst %/build-$(target)/.installed,%,$@)..."
+       cd $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target); $(setcc) ../src/configure --target=$(target) --prefix=`pwd`/../../install $(configure_$(patsubst %/build-$(target)/.installed,%,$@)) $(configure_$(patsubst %/build-$(target)/.installed,%,$@)-$(target))
+       @echo -e "\nbuilding $(patsubst %/build-$(target)/.installed,%,$@)..."
+       @cd $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make
+       @echo -e "\ninstalling $(patsubst %/build-$(target)/.installed,%,$@)..."
+       @cd $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
+       @touch $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target)/.installed