X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile.upstream;h=72189f272085276ef552f6b894ce533cb13aeaa5;hb=6cb9dd3d390fc866c0de747ded53e012859c454d;hp=914f7e3f4e8c168eee424dfe15077fa87066e940;hpb=4b3cba644a47d05cf0ddc642fbf58627feee5ba9;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 914f7e3..72189f2 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -16,9 +16,23 @@ url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc
 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:
-	ln -s upstream/install/bin/powerpc-apple-darwin-as /usr/bin/as
-	ln -s upstream/install/bin/powerpc-apple-darwin-ld /usr/bin/ld
+.install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
+	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
+	make -C upstream/darwin-linker/src/cctools/as
+	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
+	touch $@
 
 # building gcc requires binutils
 .configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
@@ -39,6 +53,7 @@ configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-new
 vendor: .vendor; @true
 .vendor:
 	@echo -e "\n\033[1mdownloading vendor-supplied headers and libraries...\033[0m"
+	mkdir -p upstream/install
 	curl http://www.megacz.com/vendor.tgz | tar xzf - -C upstream/install
 	mkdir -p upstream/install/i686-pc-mingw32
 	curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32