X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=0e2b02010129cedd0967ee0d273ef9a077fe3ce3;hp=319a44305bebd7cf5c84383e005bb9ae7cbe4dae;hb=4cc48f20c2927ad6d88f4d54e10b5fe46fcef2df;hpb=5b62cb45b6a5d4b8ca602df1ac26c91de1182f61

diff --git a/upstream/Makefile b/upstream/Makefile
index 319a443..0e2b020 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -87,7 +87,7 @@ tasks/download_%:
 	cd download && wget --passive-ftp -N $(url_$*)
 	touch $@
 
-tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download-gcc-g77
+tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
 	touch $@
 
 tasks/extract_%: tasks/download_%
@@ -124,7 +124,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)/install/bin/mips-unknown-elf-gcc && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
 		$(MAKE) install
 	touch $@
 
@@ -273,7 +273,7 @@ tasks/build_busybox: tasks/patch_busybox tasks/build_libc
 	cd build && \
 		rm -f busybox && \
 		ln -s busybox-$(version_busybox) busybox
-	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(filter-out -Werror,$(MIPS_CFLAGS)) -DNESTEDVM -g"
+	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g"
 	touch $@
 
 tasks/build_gcclass:
@@ -311,5 +311,5 @@ tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs
 			--gpc-rts=-nwebfile:tex.web     \
 			--gpc-rts=-nchangefile:tex.ch   \
 			&& \
-		mips-unknown-elf-gpc $(filter-out -Werror,$(MIPS_PCFLAGS)) tex.p $(MIPS_LDFLAGS) -o tex.mips
+		mips-unknown-elf-gpc $(MIPS_PCFLAGS) tex.p $(MIPS_LDFLAGS) -o tex.mips
 	touch $@