udp support

[nestedvm.git] / upstream / Makefile

diff --git a/upstream/Makefile b/upstream/Makefile
index b7d6643..2ee56f0 100644 (file)
--- 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
@@ -79,10 +78,10 @@ tasks/extract_darcs_%:
        touch $@
 
 update_darcs_%: tasks/extract_darcs_%
-       if [ -d "build/$*/darcs" ]; then \
+       if [ -d "build/$*/_darcs" ]; then \
                cd "build/$*" && darcs pull; \
-       else
-               cd "build/$*" && wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+       else \
+               cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \
        fi
        rm "tasks/build_darcs_$*" # to force a rebuild
 
@@ -95,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
 
@@ -332,7 +335,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     \