X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=89cdbcea64bcd95b6af68fa15687cb833ec427c3;hp=c375b30fbebf91876d175f19f08d4e9c5f4479ad;hb=391bbaf9163ef7e66824a9a83c10aa35aa61a3cc;hpb=bf7edab63fc1d980e58ae0a460fb49d75ccbc1c7

diff --git a/upstream/Makefile b/upstream/Makefile
index c375b30..89cdbce 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -51,7 +51,6 @@ tasks/build_gcc: tasks/build_linker
 tasks/build_newlib: tasks/build_gcc
 
 cross_root := $(usr)/mips-unknown-elf
-libc_a := $(cross_root)/lib/libc.a
 
 tasks/download_%:
 	if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
@@ -60,6 +59,7 @@ tasks/download_%:
 	touch $@
 
 tasks/extract_%: tasks/download_%
+	@[ -e $@ ] && echo "$@ already exists... something isn't right"
 	mkdir -p build
 	cd build && \
 		gzip -dc  ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \
@@ -68,6 +68,7 @@ tasks/extract_%: tasks/download_%
 	touch $@
 
 tasks/extract_darcs_%:
+	@[ -e $@ ] && echo "$@ already exists... something isn't right"
 	mkdir -p build
 	if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
 	if [ -d "$(root)/_darcs" ]; then \
@@ -95,12 +96,16 @@ tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib
 	cd $(cross_root)/include && sh $<
 	touch $@
 
-tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob misc/extraheaders.sh $(patsubst %,$(root)/build/org/ibex/nestedvm/%.o, crt0 support support_aux)
+top_lev_stuff := $(patsubst %,../build/org/ibex/nestedvm/%.o, crt0 support support_aux)
+
+$(top_lev_stuff):
 	# HACK: Get the top level makefile to build the support stuff
-	$(MAKE) -s -C $(root) $(patsubst %,build/org/ibex/nestedvm/%.o, crt0 support support_aux)
+	$(MAKE) -C .. $(top_lev_stuff:../%=%)
 
+tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob misc/extraheaders.sh $(top_lev_stuff)
 	# Add our support stuff to libc
-	mips-unknown-elf-ar sr $(libc_a) $(patsubst %,$(root)/build/org/ibex/nestedvm/%.o, support support_aux)
+	mips-unknown-elf-ar sr $(cross_root)/lib/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux)
+	mips-unknown-elf-ar sr $(cross_root)/lib/single-float/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux)
 	rm -f $(cross_root)/lib/crt0.o
 	cp $(root)/build/org/ibex/nestedvm/crt0.o $(cross_root)/lib/crt0.o
 
@@ -122,15 +127,8 @@ clean_%:
 tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
 	touch $@
 
-tasks/extract_%: tasks/download_%
-	mkdir -p build
-	cd build && \
-		gzip -dc  ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \
-		rm -f $* && \
-		ln -s $*-$(version_$*) $*
-	touch $@
-
 tasks/extract_gcc: tasks/download_gcc
+	@[ -e $@ ] && echo "$@ already exists... something isn't right"
 	mkdir -p build
 	cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf -
 	cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | $(TAR) -xf -
@@ -138,6 +136,7 @@ tasks/extract_gcc: tasks/download_gcc
 	touch $@
 
 tasks/patch_%: tasks/extract_%
+	@[ -e $@ ] && echo "$@ already exists... something isn't right"
 	cd build/$*-$(version_$*) &&  \
 	for p in $(patches_$*) end; do \
 		[ "$$p" = "end" ] || $(PATCH) -p0 < ../../patches/$$p || exit 1; \
@@ -161,6 +160,7 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	touch $@
 
 tasks/extract_gpc: tasks/download_gcc tasks/download_gpc
+	@[ -e $@ ] && echo "$@ already exists... something isn't right"
 	mkdir -p build/gpc.extract
 	cd build/gpc.extract && \
 		gzip -dc ../../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf - && \
@@ -332,7 +332,7 @@ tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs
 	cp misc/tex.ch build/tex/tex.ch
 	cd build/tex && \
 		$(TAR) xfz ../../download/texinputs-$(version_texinputs).tgz && \
-		java -cp $(root)/build tests.Tangle \
+		java -cp $(root)/build:$(upstream)/build/classgen/build tests.Tangle \
 			--gpc-rts=-nPascalfile:tex.p    \
 			--gpc-rts=-npool:tex.pool       \
 			--gpc-rts=-nwebfile:tex.web     \