2003/09/08 05:36:01

darcs-hash:20040130070545-2ba56-26184d023b12bf6070fc7ef05029e98a98155980.gz

diff --git a/Makefile.upstream b/Makefile.upstream
index 8fa2290..c03aba9 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -31,9 +31,9 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
        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.NEW
-       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ld.NEW -dylib_file /usr/lib/system/libmathCommon.A.dylib:"`pwd`"/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -L"`pwd`"/upstream/install/powerpc-apple-darwin/lib $$@\n" > upstream/install/powerpc-apple-darwin/bin/ld
+       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ld.NEW -dylib_file /usr/lib/system/libmathCommon.A.dylib:"`pwd`"/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -L"`pwd`"/upstream/install/powerpc-apple-darwin/lib \$$@\n" > upstream/install/powerpc-apple-darwin/bin/ld
        chmod +x upstream/install/powerpc-apple-darwin/bin/ld
-       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/apple-libtool $$1 -o $$1\n" > upstream/install/powerpc-apple-darwin/bin/ranlib
+       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/apple-libtool \$$1 -o \$$1\n" > upstream/install/powerpc-apple-darwin/bin/ranlib
        chmod +x upstream/install/powerpc-apple-darwin/bin/ranlib
        cp upstream/darwin-linker/src/cctools/misc/libtool.NEW upstream/install/powerpc-apple-darwin/bin/apple-libtool
        cp upstream/darwin-linker/src/cctools/misc/strip.NEW upstream/install/powerpc-apple-darwin/bin/strip
@@ -45,7 +45,7 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ar powerpc-apple-darwin-ar
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ranlib powerpc-apple-darwin-ranlib
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip
-       echo -e "#!/bin/sh\nc++filt $$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3
+       echo -e "#!/bin/sh\nc++filt \$$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3
        touch $@
 
 # building gcc requires binutils
@@ -55,8 +55,8 @@ 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         := --with-ranlib=$(shell pwd)/upstream/install/bin/powerpc-apple-darwin-ranlib
+configure_gcc-3.3-powerpc-apple-darwin  := --enable-threads=posix --disable-hash-synchronization --disable-multilib
+configure_gcc-3.3-powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/powerpc-apple-darwin/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