dump specs before pass2

darcs-hash:20040510112111-5007d-c106504b5995f002d858ca4f79d5bd435e07a9dc.gz

diff --git a/upstream/Makefile b/upstream/Makefile
index 430c2e0..c8cede7 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -36,23 +36,6 @@ export PATH
 PATCH = $(shell test `uname` = SunOS && echo gpatch || echo patch)
 
 tasks/full_toolchain: tasks/build_binutils tasks/build_gcc_step2 tasks/build_libc
 PATCH = $(shell test `uname` = SunOS && echo gpatch || echo patch)
 
 tasks/full_toolchain: tasks/build_binutils tasks/build_gcc_step2 tasks/build_libc

-       for f in crt0.o support.o support_aux.o; do \
-               rm -f "$(usr)/mips-unknown-elf/lib/$$f"; \
-               ln -s "$(root)/build/org/ibex/nestedvm/$$f" "$(usr)/mips-unknown-elf/lib/$$f"; \
-       done
-
-       rm -f "$(usr)/mips-unknown-elf/lib/linker.ld"
-       ln -s "$(root)/src/org/ibex/nestedvm/linker.ld" "$(usr)/mips-unknown-elf/lib/linker.ld"
-
-       if [ ! -e "$(usr)/mips-unknown-elf/include/getopt.h" ]; then \
-               echo '#include <unistd.h>' > "$(usr)/mips-unknown-elf/include/getopt.h"; \
-       fi
-       
-       mips-unknown-elf-gcc -dumpspecs \
-               | sed '/startfile:$$/{n;s/crt0%O%s/crt0%O%s support%O%s support_aux%O%s/;};' \
-               | sed '/link_command:$$/{n;s/%{T\*}/%{T*} %{!T:-T linker.ld%s}/;};' \
-               > "$(usr)/lib/gcc-lib/mips-unknown-elf/$(version_gcc)/specs"
-               

        touch $@
 
 tasks/build_gcc: tasks/build_binutils
        touch $@
 
 tasks/build_gcc: tasks/build_binutils

@@ -104,6 +87,23 @@ tasks/build_%: tasks/patch_%
        touch $@
 
 tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
        touch $@
 
 tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc

+       for f in crt0.o support.o support_aux.o; do \
+               rm -f "$(usr)/mips-unknown-elf/lib/$$f"; \
+               ln -s "$(root)/build/org/ibex/nestedvm/$$f" "$(usr)/mips-unknown-elf/lib/$$f"; \
+       done
+
+       rm -f "$(usr)/mips-unknown-elf/lib/linker.ld"
+       ln -s "$(root)/src/org/ibex/nestedvm/linker.ld" "$(usr)/mips-unknown-elf/lib/linker.ld"
+
+       if [ ! -e "$(usr)/mips-unknown-elf/include/getopt.h" ]; then \
+               echo '#include <unistd.h>' > "$(usr)/mips-unknown-elf/include/getopt.h"; \
+       fi
+       
+       mips-unknown-elf-gcc -dumpspecs \
+               | sed '/startfile:$$/{n;s/crt0%O%s/crt0%O%s support%O%s support_aux%O%s/;};' \
+               | sed '/link_command:$$/{n;s/%{T\*}/%{T*} %{!T:-T linker.ld%s}/;};' \
+               > "$(usr)/lib/gcc-lib/mips-unknown-elf/$(version_gcc)/specs"
+               

        mkdir -p $(usr)
        mkdir -p build/gcc-obj && cd build/gcc-obj && \
                ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
        mkdir -p $(usr)
        mkdir -p build/gcc-obj && cd build/gcc-obj && \
                ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \