X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=7cc4917e2defad1b3e2ab0ab689f4e8e7b159d12;hp=a38cb918a7c5c425af1b07d21d399c89903a04ca;hb=130c367a4e1f2fa9dbc376c0dcef6666e586ea7a;hpb=21df72aeffc3ce4472e453ac3a8c1fe25b9df315

diff --git a/Makefile.upstream b/Makefile.upstream
index a38cb91..7cc4917 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -22,7 +22,7 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
 ifneq ($(shell uname),Darwin)
 	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
+	cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; chmod +x ../../links.sh; ../../links.sh
 endif
 	make -C upstream/darwin-linker/src/cctools/libstuff
 	make -C upstream/darwin-linker/src/cctools/misc
@@ -40,7 +40,9 @@ endif
 	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
+	cp upstream/darwin-linker/src/cctools/ar/ar.NEW upstream/install/powerpc-apple-darwin/bin/ar.NEW
+	echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ar.NEW \$$@\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ranlib \$$2\n" > upstream/install/powerpc-apple-darwin/bin/ar
+	chmod +x 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
@@ -53,8 +55,6 @@ endif
 
 # building gcc requires binutils
 .configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)      
-	test -e upstream/install/bin/$(target)-ar || ln -s ../$(target)/bin/ar upstream/install/bin/$(target)-ar
-	test -e upstream/install/bin/$(target)-ranlib || ln -s ../$(target)/bin/ar upstream/install/bin/$(target)-ranlib
 
 # building newlib requires gcc
 .configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target)