[project @ 2003-06-05 16:50:30 by reid]

Swap rules for building .o files by compiling and by assembling so that we compile if possible

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 02469fe..b987bb8 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -135,7 +135,7 @@ endif
 .PRECIOUS: %.gc
 
 %.hs %_stub_ffi.c %_stub_ffi.h : %.gc
-       $(GREENCARD) $(GC_OPTS) $< -o $@
+       $(GREENCARD) $(GC_OPTS) $<
 
 %.lhs : %.gc
        $(GREENCARD) $(GC_OPTS) $< -o $@
@@ -148,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 $@
 
@@ -166,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 $@