X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=42952ffb84dfab3f91a59626e2ebdcc86664e7da;hb=49e39f424a6abad7bf3eb617dfcadb0c9b94b812;hp=3fe0c49b3303cfb3fdbaf1706ea88efd43508312;hpb=3e027114ff66ae11fbbcefef957e46a3e85b828b;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 3fe0c49..42952ff 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -24,16 +24,18 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
 	cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; ../../links.sh
 	make -C upstream/darwin-linker/src/cctools/libstuff
 	make -C upstream/darwin-linker/src/cctools/misc
+	touch upstream/darwin-linker/src/cctools/misc/makeUser.c upstream/darwin-linker/src/cctools/misc/make.h
 	make -C upstream/darwin-linker/src/cctools/misc libtool.NEW
 	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.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 -Z -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
 	chmod +x upstream/install/powerpc-apple-darwin/bin/ranlib
-	cp upstream/darwin-linker/src/cctools/misc/libtool.NEW 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
 	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.NEW upstream/install/powerpc-apple-darwin/bin/ar
@@ -43,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
@@ -53,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-headers=../../install/$(target)/include
+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
@@ -90,6 +92,7 @@ vendor: .vendor; @true
 		--prefix=`pwd`/../../install \
 		$(configure_$*) \
 		$(configure_$*-$(target))
+	rm -rf upstream/gcc-3.3/build-powerpc-apple-darwin/powerpc-apple-darwin/libstdc++-v3/
 	touch $@
 
 .install_%_$(target): .configure_%_$(target)