GHC_MANGLER-->MANGLER

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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index f45682f..10926ee 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -22,15 +22,11 @@
 
 .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
-# different versions from the same sources.  See ghc/compiler/Makefile.
+# different versions from the same sources.  See compiler/Makefile.
 ifneq "$(odir)" ""
 odir_ = $(odir)/
 else
@@ -139,7 +135,7 @@ $(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)))
+       $(MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
 
 $(odir_)%.o : %.s
        $(CC) -c -o $@ $<
@@ -169,7 +165,7 @@ endif # BootingFromHc
 #
 ifneq "$(BootingFromHc)" "YES"
 %_hsc.c %_hsc.h %.hs : %.hsc
-       $(HSC2HS) $(HSC2HS_OPTS) $<
+       $(HSC2HS_INPLACE) $(HSC2HS_OPTS) $<
        @touch $(patsubst %.hsc,%_hsc.c,$<)
 endif