Fix SPARC build, missing #include

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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 10926ee..762636a 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -83,7 +83,7 @@ $(odir_)%.$(way_)s : %.$(way_)hc
 $(odir_)%.$(way_)hc : %.lhc
        @$(RM) $@
        $(UNLIT) $< $@
-       @chmod 444 $@
+       $(GENERATED_FILE) $@
 
 
 # Here's an interesting rule!
@@ -134,10 +134,10 @@ else
 $(odir_)%.raw_s : %.hc
        $(CC) -x c $< -o $@ -S -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
 
-$(odir_)%.s : %.raw_s
+$(odir_)%.s : $(odir_)%.raw_s
        $(MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
 
-$(odir_)%.o : %.s
+$(odir_)%.o : $(odir_)%.s
        $(CC) -c -o $@ $<
 
 endif # not BootingFromUnregisterisedHc
@@ -358,17 +358,17 @@ endif
 %.prl : %.lprl
        @$(RM) $@
        $(UNLIT) $(UNLIT_OPTS) $< $@
-       @chmod 444 $@
+       $(GENERATED_FILE) $@
 
 %.c : %.lc
        @$(RM) $@
        $(UNLIT) $(UNLIT_OPTS) $< $@
-       @chmod 444 $@
+       $(GENERATED_FILE) $@
 
 %.h : %.lh
        @$(RM) $@
        $(UNLIT) $(UNLIT_OPTS) $< $@
-       @chmod 444 $@
+       $(GENERATED_FILE) $@
 
 #-----------------------------------------------------------------------------
 # Win32 resource files
@@ -378,7 +378,7 @@ endif
 
 %.$(way_)o : %.$(way_)rc
        @$(RM) $@
-       windres $< $@
+       windres --preprocessor="$(CPP) -xc -DRC_INVOKED" $< $@
 
 #-----------------------------------------------------------------------------
 # Preprocessor suffix rule