X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=69d164e94cdece084c256a420ba36108b0ca7d84;hb=72f5cd2fbc56c266e92f974a4561fbe878628b63;hp=49a420dd7ebe5a3b9c9a8911bdadc30536d31585;hpb=be6592933f4cdf78a495233376e44c9458b17b78;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 49a420d..69d164e 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -134,8 +134,8 @@ endif
 
 .PRECIOUS: %.gc
 
-%.hs : %.gc
-	$(GREENCARD) $(GC_OPTS) $< -o $@
+%.hs %_stub_ffi.c %_stub_ffi.h : %.gc
+	$(GREENCARD) $(GC_OPTS) $<
 
 %.lhs : %.gc
 	$(GREENCARD) $(GC_OPTS) $< -o $@
@@ -146,13 +146,14 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
-ifeq "$(UseGhcForCc)" "YES"
+# UseGhcForCc is only relevant when not booting from HC files.
+ifeq "$(UseGhcForCc) $(BootingFromHc)" "YES NO"
 
-$(odir_)%.$(way_)o : %.$(way_)s
+$(odir_)%.$(way_)o : %.c
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-$(odir_)%.$(way_)o : %.c
+$(odir_)%.$(way_)o : %.$(way_)s
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
@@ -166,14 +167,14 @@ $(odir_)%.$(way_)s : %.c
 
 else
 
-$(odir_)%.$(way_)o : %.$(way_)s
-	@$(RM) $@
-	$(AS) $(AS_OPTS) -o $@ $<
-
 $(odir_)%.$(way_)o : %.c
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
 
+$(odir_)%.$(way_)o : %.$(way_)s
+	@$(RM) $@
+	$(AS) $(AS_OPTS) -o $@ $<
+
 $(odir_)%.$(way_)o : %.S
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
@@ -307,4 +308,4 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@
+	$(CPP) $(RAWCPP_FLAGS) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@