X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=7a25beed4ea53055f474b050651d4092b923347c;hp=37d42b5587e6765a0d96ea79665ca835a23c772a;hb=6ca8e846620f8c46811c8417b6f9b7f05d79a706;hpb=3175eeed074a015d5621de59c0fa877d4efe5112

diff --git a/upstream/Makefile b/upstream/Makefile
index 37d42b5..7a25bee 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
@@ -70,15 +69,24 @@ tasks/extract_%: tasks/download_%
 tasks/extract_darcs_%:
 	mkdir -p build
 	if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
-	cd build && darcs get --verbose "$(darcs_$*)"
+	if [ -d "$(root)/_darcs" ]; then \
+		cd build && darcs get --repo-name="$*" --verbose "$(darcs_$*)"; \
+	else \
+		mkdir -p "build/$*" && cd "build/$*"; \
+		wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
 	touch $@
 
 update_darcs_%: tasks/extract_darcs_%
-	cd "build/$*" && darcs pull
+	if [ -d "build/$*/_darcs" ]; then \
+		cd "build/$*" && darcs pull; \
+	else \
+		cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
 	rm "tasks/build_darcs_$*" # to force a rebuild
 
 tasks/build_darcs_%: tasks/extract_darcs_%
-	cd "build/$*" && make
+	cd "build/$*" && $(MAKE)
 	touch $@
 
 tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib
@@ -86,12 +94,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