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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 8ec5acb..6a0a445 100644
--- 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,6 +143,26 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
+ifeq "$(UseGhcForCc)" "YES"
+
+%.$(way_)o : %.$(way_)s
+	@$(RM) $@
+	$(HC) $(GHC_CC_OPTS) -c $< -o $@
+
+%.$(way_)o : %.c
+	@$(RM) $@
+	$(HC) $(GHC_CC_OPTS) -c $< -o $@
+
+%.$(way_)o : %.S
+	@$(RM) $@
+	$(HC) $(GHC_CC_OPTS) -c $< -o $@
+
+%.$(way_)s : %.c
+	@$(RM) $@
+	$(HC) $(GHC_CC_OPTS) -S $< -o $@
+
+else
+
 %.$(way_)o : %.$(way_)s
 	@$(RM) $@
 	$(AS) $(AS_OPTS) -o $@ $< || ( $(RM) $@ && exit 1 )
@@ -155,9 +175,18 @@ endif
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
 
-#%.$(way_)s : %.c
-#	@$(RM) $@
-#	$(CC) $(CC_OPTS) -S $< -o $@
+%.$(way_)s : %.c
+	@$(RM) $@
+	$(CC) $(CC_OPTS) -S $< -o $@
+
+endif
+
+# stubs are automatically generated and compiled by GHC
+%_stub.$(way_)o: %.o
+	@:
+
+# -----------------------------------------------------------------------------
+# Flex/lex
 
 %.c : %.flex
 	@$(RM) $@
@@ -166,10 +195,6 @@ endif
 	@$(RM) $@
 	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
 
-# stubs are automatically generated and compiled by GHC
-%_stub.$(way_)o: %.o
-	@:
-
 #-----------------------------------------------------------------------------
 # Yacc stuff
 
@@ -228,6 +253,8 @@ endif
 #	$(JADE) -t sgml -V html-index -d $(SGMLSTYLESHEET) -c $(DOCBOOK_CATALOG) $<
 #	$(PERL) $(COLLATEINDEX) -N -o index.sgml
 	$(SGML2HTML) $(SGML2HTML_OPTS) $<
+# touch the .html file so that it is seen to be built
+	@touch $@
 
 %.html : %.tex
 	@$(RM) $@
@@ -277,4 +304,4 @@ endif
 
 % : %.pp
 	rm -f $@
-	$(CPP) -I$(GHC_INCLUDE_DIR) -x c $< | $(SED) -e '/^#/d' > $@
+	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@