projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings in CmmCPS
[ghc-hetmet.git]
/
mk
/
suffix.mk
diff --git
a/mk/suffix.mk
b/mk/suffix.mk
index
f45682f
..
762636a
100644
(file)
--- a/
mk/suffix.mk
+++ b/
mk/suffix.mk
@@
-22,15
+22,11
@@
.DELETE_ON_ERROR:
.DELETE_ON_ERROR:
-# This line prevents GNU make from deleting any intermediate targets:
-
-.SECONDARY:
-
#-----------------------------------------------------------------------------
# Haskell Suffix Rules
# The $(odir) support is for building GHC, where we need to build three
#-----------------------------------------------------------------------------
# Haskell Suffix Rules
# The $(odir) support is for building GHC, where we need to build three
-# different versions from the same sources. See ghc/compiler/Makefile.
+# different versions from the same sources. See compiler/Makefile.
ifneq "$(odir)" ""
odir_ = $(odir)/
else
ifneq "$(odir)" ""
odir_ = $(odir)/
else
@@
-87,7
+83,7
@@
$(odir_)%.$(way_)s : %.$(way_)hc
$(odir_)%.$(way_)hc : %.lhc
@$(RM) $@
$(UNLIT) $< $@
$(odir_)%.$(way_)hc : %.lhc
@$(RM) $@
$(UNLIT) $< $@
- @chmod 444 $@
+ $(GENERATED_FILE) $@
# Here's an interesting rule!
# Here's an interesting rule!
@@
-138,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_)%.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
- $(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
+$(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
$(CC) -c -o $@ $<
endif # not BootingFromUnregisterisedHc
@@
-169,7
+165,7
@@
endif # BootingFromHc
#
ifneq "$(BootingFromHc)" "YES"
%_hsc.c %_hsc.h %.hs : %.hsc
#
ifneq "$(BootingFromHc)" "YES"
%_hsc.c %_hsc.h %.hs : %.hsc
- $(HSC2HS) $(HSC2HS_OPTS) $<
+ $(HSC2HS_INPLACE) $(HSC2HS_OPTS) $<
@touch $(patsubst %.hsc,%_hsc.c,$<)
endif
@touch $(patsubst %.hsc,%_hsc.c,$<)
endif
@@
-362,17
+358,17
@@
endif
%.prl : %.lprl
@$(RM) $@
$(UNLIT) $(UNLIT_OPTS) $< $@
%.prl : %.lprl
@$(RM) $@
$(UNLIT) $(UNLIT_OPTS) $< $@
- @chmod 444 $@
+ $(GENERATED_FILE) $@
%.c : %.lc
@$(RM) $@
$(UNLIT) $(UNLIT_OPTS) $< $@
%.c : %.lc
@$(RM) $@
$(UNLIT) $(UNLIT_OPTS) $< $@
- @chmod 444 $@
+ $(GENERATED_FILE) $@
%.h : %.lh
@$(RM) $@
$(UNLIT) $(UNLIT_OPTS) $< $@
%.h : %.lh
@$(RM) $@
$(UNLIT) $(UNLIT_OPTS) $< $@
- @chmod 444 $@
+ $(GENERATED_FILE) $@
#-----------------------------------------------------------------------------
# Win32 resource files
#-----------------------------------------------------------------------------
# Win32 resource files
@@
-382,7
+378,7
@@
endif
%.$(way_)o : %.$(way_)rc
@$(RM) $@
%.$(way_)o : %.$(way_)rc
@$(RM) $@
- windres $< $@
+ windres --preprocessor="$(CPP) -xc -DRC_INVOKED" $< $@
#-----------------------------------------------------------------------------
# Preprocessor suffix rule
#-----------------------------------------------------------------------------
# Preprocessor suffix rule