X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=f78f3cafff9cbc12d8d05e46ab4b496200cff58b;hp=3a5cd7b0efb02ae115e11964b53cf7317be4c757;hb=05ed18319e07e45668a6837356e33723dc61fcfc;hpb=18ecce5ea457fb0839a543ecbbfedcfd23b7b168

diff --git a/upstream/Makefile b/upstream/Makefile
index 3a5cd7b..f78f3ca 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -82,9 +82,6 @@ clean_%:
 gpc := $(usr)/bin/mips-unknown-elf-gpc
 gpc_flags := --big-endian -w -lgpc -lc $(usr)/mips-unknown-elf/lib/support*.o
 gpc_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld
-g77 := $(usr)/bin/mips-unknown-elf-g77
-g77_flags := --big-endian -w -lg2c -lc $(usr)/mips-unknown-elf/lib/support*.o
-g77_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld
 
 # FIXME ugly path hacks evil bad
 nestedvm := java -cp $(usr)/../build/bcel/bcel-5.1.jar:$(usr)/../../build org.ibex.nestedvm.Compiler -outformat class
@@ -113,6 +110,7 @@ tasks/build_tex: build/tex/tex.mips
 tasks/extract_texinputs: tasks/build_tex tasks/download_texinputs
 	cd build/tex; tar xvzf ../../download/texinputs-1.0.tgz
 	touch $@
+
 tasks/extract_linpack: tasks/download_linpack ; touch $@
 tasks/download_linpack:
 	mkdir -p build/linpack
@@ -183,7 +181,7 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	mkdir -p $(usr)
 	mkdir -p build/gcc-obj && cd build/gcc-obj && \
 		echo | ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
-		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/bin/mips-unknown-elf-gcc && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/install/bin/mips-unknown-elf-gcc && \
 		$(MAKE) install
 	touch $@