[project @ 2002-09-30 10:17:38 by simonmar]

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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index fecfd3a..6a0a445 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -101,7 +101,7 @@ endif # BootingViaC
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
 #
-.PRECIOUS: %.hs
+.SECONDARY: %.hs
 
 %.hs : %.ly
        $(HAPPY) $(HAPPY_OPTS) $<
@@ -143,41 +143,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 $@ $< || ( $(RM) $@ && exit 1 )
 
 %.$(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