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

diff --git a/Makefile.upstream b/Makefile.upstream
index 72189f2..42952ff 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -5,6 +5,7 @@
 
 # deal with Apple's brokenness
 setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))"
+setcc += PATH=`pwd`/upstream/install/bin:$$PATH
 
 # where to get stuff
 url_newlib-1.11.0      := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz
@@ -23,15 +24,28 @@ 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
-	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/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
+	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/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
+	mkdir -p upstream/install/bin
+	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ld powerpc-apple-darwin-ld
+	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/as powerpc-apple-darwin-as
+	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
 	touch $@
 
 # building gcc requires binutils
@@ -41,13 +55,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-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
 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
@@ -77,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)