X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=e85ec6dcf6be8f3c199b7ce626bac4136003d143;hp=ff67f5a11dbfb301ee8785667faf7f1418af4f8d;hb=52752783a05dc40fd958839267a2c9bd102f33aa;hpb=ea298d9ade25bc9f0fde88ef701b2a500d2c1f5a

diff --git a/Makefile b/Makefile
index ff67f5a..e85ec6d 100644
--- a/Makefile
+++ b/Makefile
@@ -77,12 +77,14 @@ all: build/mips2java$(EXE_EXT) $(mips_objects)
 endif
 
 # HACK: Ensure libc is kept up to date when our mips_objects change
-$(tasks)/build_libc: $(mips_object) upstream/misc/extraheaders.sh
+$(tasks)/build_libc: $(mips_objects) 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)"
 
@@ -210,7 +212,7 @@ runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class)
 		org/ibex/nestedvm/util/Seekable\$$*.class
 
 .manifest:
-	echo -ne "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@
+	printf "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@
 
 nestedvm.jar: $(java_classes) .manifest
 	cd build && jar cfm ../$@ ../.manifest $(java_classes:build/%.class=%*.class)