X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=ade0255dd9e5ff431ae423bbfe41abf52aac2bb5;hb=c63aaee42e3e95276861121286eefce511cd1343;hp=6a0a44541c863f2c8f495a7edd11c49d2a4f06dc;hpb=69540b16367f4d841f0721988f34fb59daf84305;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 6a0a445..ade0255 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -16,6 +16,12 @@
 
 .SUFFIXES:
 
+# This declaration tells GNU make to delete the target if it has
+# changed and the command which created it exited with a non-zero exit
+# code.
+
+.DELETE_ON_ERROR:
+
 # However, if $(way) is set then we have to define $(way_) and $(_way)
 # from it in the obvious fashion.
 # This must be done here (or earlier), but not in target.mk with the other
@@ -165,7 +171,7 @@ else
 
 %.$(way_)o : %.$(way_)s
 	@$(RM) $@
-	$(AS) $(AS_OPTS) -o $@ $< || ( $(RM) $@ && exit 1 )
+	$(AS) $(AS_OPTS) -o $@ $<
 
 %.$(way_)o : %.c
 	@$(RM) $@
@@ -190,10 +196,10 @@ endif
 
 %.c : %.flex
 	@$(RM) $@
-	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
+	$(FLEX) -t $(FLEX_OPTS) $< > $@
 %.c : %.lex
 	@$(RM) $@
-	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
+	$(FLEX) -t $(FLEX_OPTS) $< > $@
 
 #-----------------------------------------------------------------------------
 # Yacc stuff
@@ -303,5 +309,5 @@ endif
 # Preprocessor suffix rule
 
 % : %.pp
-	rm -f $@
+	@$(RM) $@
 	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@