2003/09/07 09:36:24

darcs-hash:20040130070519-2ba56-eb5c5c559dad9cfa0778fe1e8de7a35c0e7db207.gz

diff --git a/Makefile.upstream b/Makefile.upstream
index 72189f2..0ea759f 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -25,6 +25,7 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
        make -C upstream/darwin-linker/src/cctools/misc
        make -C upstream/darwin-linker/src/cctools/ld; true
        make -C upstream/darwin-linker/src/cctools/as
+       make -C upstream/darwin-linker/src/cctools/ar
        mkdir -p upstream/install/powerpc-apple-darwin/bin
        cp upstream/darwin-linker/src/cctools/ld/ld_dir/ld.NEW \
                upstream/install/powerpc-apple-darwin/bin/ld
@@ -32,6 +33,8 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
                upstream/install/powerpc-apple-darwin/bin/strip
        cp upstream/darwin-linker/src/cctools/as/appc_dir/as \
                upstream/install/powerpc-apple-darwin/bin/as
+       cp upstream/darwin-linker/src/cctools/ar/ar \
+               upstream/install/powerpc-apple-darwin/bin/ar
        touch $@
 
 # building gcc requires binutils
@@ -41,13 +44,14 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
 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 --enable-libgcj
-configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization
+configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization 
+configure_gcc-3.3-powerpc-apple         := --with-headers=../../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
 configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads
 
-.PRECIOUS: .vendor .download_%_$(target) .configure_%_$(target) .install_%_$(target)
+.PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
 vendor: .vendor; @true