no -Werror for upstream

darcs-hash:20040521111400-24bed-edd1577e9d7fa29ba4cb27bbcf32a65988969906.gz

diff --git a/Makefile b/Makefile
index ff67f5a..af6e28f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,9 +80,11 @@ endif
 $(tasks)/build_libc: $(mips_object) upstream/misc/extraheaders.sh
 
 $(tasks)/%:
-       $(MAKE) -C upstream tasks/$* usr="$(usr)" MIPS_CFLAGS="$(MIPS_CFLAGS)" MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_PCFLAGS="$(MIPS_PCFLAGS)"
-
-
+       $(MAKE) -C upstream tasks/$* usr="$(usr)" \
+               MIPS_CFLAGS="$(filter-out -Werror,$(MIPS_CFLAGS))" \
+               MIPS_PCFLAGS="$(filter-out -Werror,$(MIPS_PCFLAGS))" \
+               MIPS_LDFLAGS="$(MIPS_LDFLAGS)"
+               
 upstream_clean_%:
        $(MAKE) -C upstream clean_$* usr="$(usr)"
 

diff --git a/upstream/Makefile b/upstream/Makefile
index d9077b2..64886ea 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -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 $@