X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=d71f8bed0d9f4b081e6bab7c313a6bc2b99f540c;hb=80e82433fb92366d007d63d4ba44b25dfa9f4425;hp=75d8a817b7af91553bc6ba47b71ca30e53b39818;hpb=2218a9cd7dd8e7fa11aef4156f54b6b76623c531;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 75d8a81..d71f8be 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -24,19 +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/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 -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
+	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
@@ -46,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
@@ -115,4 +124,6 @@ vendor: .vendor; @true
 	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
 	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
 	echo 'exit $$EXIT' >> .jikes
+	mv .jikes .jikes+
+	cp .jikes+ .jikes
 	chmod +x .jikes