[project @ 2002-10-27 10:38:32 by mthomas]

[ghc-hetmet.git] / mk / suffix.mk

diff --git a/mk/suffix.mk b/mk/suffix.mk
index fecfd3a..ade0255 100644 (file)
--- 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
@@ -101,7 +107,7 @@ endif # BootingViaC
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
 #
-.PRECIOUS: %.hs
+.SECONDARY: %.hs
 
 %.hs : %.ly
        $(HAPPY) $(HAPPY_OPTS) $<
@@ -143,41 +149,41 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
-ifeq "$(UseGhcForCc)" ""
+ifeq "$(UseGhcForCc)" "YES"
 
 %.$(way_)o : %.$(way_)s
        @$(RM) $@
-       $(AS) $(AS_OPTS) -o $@ $< || ( $(RM) $@ && exit 1 )
+       $(HC) $(GHC_CC_OPTS) -c $< -o $@
 
 %.$(way_)o : %.c
        @$(RM) $@
-       $(CC) $(CC_OPTS) -c $< -o $@
+       $(HC) $(GHC_CC_OPTS) -c $< -o $@
 
 %.$(way_)o : %.S
        @$(RM) $@
-       $(CC) $(CC_OPTS) -c $< -o $@
+       $(HC) $(GHC_CC_OPTS) -c $< -o $@
 
 %.$(way_)s : %.c
        @$(RM) $@
-       $(CC) $(CC_OPTS) -S $< -o $@
+       $(HC) $(GHC_CC_OPTS) -S $< -o $@
 
 else
 
 %.$(way_)o : %.$(way_)s
        @$(RM) $@
-       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+       $(AS) $(AS_OPTS) -o $@ $<
 
 %.$(way_)o : %.c
        @$(RM) $@
-       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+       $(CC) $(CC_OPTS) -c $< -o $@
 
 %.$(way_)o : %.S
        @$(RM) $@
-       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+       $(CC) $(CC_OPTS) -c $< -o $@
 
 %.$(way_)s : %.c
        @$(RM) $@
-       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+       $(CC) $(CC_OPTS) -S $< -o $@
 
 endif
 
@@ -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' > $@