X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=0c8fb7c8a7681664b8e1f74d21f48cb0004cb0d2;hb=b06bf9bd08f3e5ab7f01e5f70a18396b24e3fd32;hp=96834fc4b8aa3243a9d28b63159a58f37e5735b1;hpb=351afa5ad7cc7012d5460c126cad4999e457a30d;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 96834fc..0c8fb7c 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -22,17 +22,6 @@
 
 .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
-# way management, because the pattern rules in this file take a snapshot of
-# the value of $(way_) and $(_way), and it's no good setting them later!
-
-ifneq "$(way)" ""
-  way_ := $(way)_
-  _way := _$(way)
-endif
-
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
@@ -145,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 $@
@@ -159,11 +148,11 @@ endif
 
 ifeq "$(UseGhcForCc)" "YES"
 
-$(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 $@
 
@@ -177,14 +166,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 $@
@@ -318,4 +307,4 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@
+	$(CPP) $(RAWCPP_FLAGS) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@