X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=29da789247e42a6509cf324be62c4a6a3bd95499;hp=85d6513b74685d9f83406a8d3a06c29c57b2025d;hb=2b230ae442e1295b43ae775f6f9fa5e9234357cc;hpb=b8916aa502536bcb2dce319c97f3afbd12646080

diff --git a/Makefile.upstream b/Makefile.upstream
index 85d6513..29da789 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
@@ -17,19 +18,29 @@ url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
-	cd upstream/darwin-linker; \
-		cvs -d :pserver:anonymous@anoncvs.opendarwin.org:/Volumes/src/cvs/od co \
-		src/cctools/ld src/cctools/libstuff src/cctools/misc src/cctools/ld src/cctools/include
-	find upstream/darwin-linker/src -name CVS | xargs rm -rf
+	cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz
 	cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done
+	cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff
 	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
 	make -C upstream/darwin-linker/src/cctools/ld; true
-	cp upstream/darwin-linker/src/cctools/ld/ld_dir/ld.NEW \
-		upstream/install/bin/powerpc-apple-darwin-ld
-	cp upstream/darwin-linker/src/cctools/misc/strip.NEW
-		upstream/install/bin/powerpc-apple-darwin-strip
+	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`/xwt/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -Z -L`pwd`/upstream/install/powerpc-apple-darwin/lib $$@ > upstream/install/powerpc-apple-darwin/bin/ld
+	chmod +x 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/ar/ar.NEW upstream/install/powerpc-apple-darwin/bin/ar
+	mkdir -p upstream/install/bin
+	cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/ld powerpc-apple-darwin-ld
+	cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/as powerpc-apple-darwin-as
+	cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/ar powerpc-apple-darwin-ar
+	cd upstream/install/bin; ln -s ../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
 .configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
@@ -38,13 +49,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