X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=49a420dd7ebe5a3b9c9a8911bdadc30536d31585;hb=a08aa16ae39b5fc2f4541e9fd33009a5288ba0ae;hp=cdbefdd771c8e3cf72f8643d161c95327d1e36af;hpb=145c7ebddb14323738902ad726cd339eb50e03d4;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index cdbefdd..49a420d 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -22,17 +22,6 @@
 
 .DELETE_ON_ERROR:
 
-# However, if $(way) is set then we have to define $(way_) and $(_way)
-# from it in the obvious fashion.
-# This must be done here (or earlier), but not in target.mk with the other
-# way management, because the pattern rules in this file take a snapshot of
-# the value of $(way_) and $(_way), and it's no good setting them later!
-
-ifneq "$(way)" ""
-  way_ := $(way)_
-  _way := _$(way)
-endif
-
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
@@ -41,40 +30,48 @@ endif
 # this case.
 ifneq "$(BootingFromHc)" "YES"
 
-%.$(way_)o : %.hs
+# The $(odir) support is for building GHC, where we need to build three
+# different versions from the same sources.  See ghc/compiler/Makefile.
+ifneq "$(odir)" ""
+odir_ = $(odir)/
+else
+odir_ =
+endif
+
+$(odir_)%.$(way_)o : %.hs
 	$(HC_PRE_OPTS)
-	$(HC) $(HC_OPTS) -c $< -o $@
+	$(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi
 	$(HC_POST_OPTS)
 
-%.$(way_)o : %.lhs	 
+$(odir_)%.$(way_)o : %.lhs	 
 	$(HC_PRE_OPTS)
-	$(HC) $(HC_OPTS) -c $< -o $@
+	$(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi
 	$(HC_POST_OPTS)
 
-%.$(way_)hc : %.lhs	 
+$(odir_)%.$(way_)hc : %.lhs	 
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
 
-%.$(way_)hc : %.hs	 
+$(odir_)%.$(way_)hc : %.hs	 
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
 
-%.$(way_)o : %.$(way_)hc 
+$(odir_)%.$(way_)o : %.$(way_)hc 
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
-%.$(way_)o : %.hc 
+$(odir_)%.$(way_)o : %.hc 
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
-%.$(way_)s : %.$(way_)hc 
+$(odir_)%.$(way_)s : %.$(way_)hc 
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -S $< -o $@
 	$(HC_POST_OPTS)
 
-%.$(way_)hc : %.lhc
+$(odir_)%.$(way_)hc : %.lhc
 	@$(RM) $@
 	$(UNLIT) $< $@
 	@chmod 444 $@
@@ -95,7 +92,7 @@ ifneq "$(BootingFromHc)" "YES"
 	else exit 0 ; \
 	fi							
 
-%.$(way_)hi : %.$(way_)hc
+$(odir_)%.$(way_)hi : %.$(way_)hc
 	@if [ ! -f $@ ] ; then \
 	    echo Panic! $< exists, but $@ does not.; \
 	    exit 1; \
@@ -151,37 +148,37 @@ endif
 
 ifeq "$(UseGhcForCc)" "YES"
 
-%.$(way_)o : %.$(way_)s
+$(odir_)%.$(way_)o : %.$(way_)s
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-%.$(way_)o : %.c
+$(odir_)%.$(way_)o : %.c
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-%.$(way_)o : %.S
+$(odir_)%.$(way_)o : %.S
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-%.$(way_)s : %.c
+$(odir_)%.$(way_)s : %.c
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -S $< -o $@
 
 else
 
-%.$(way_)o : %.$(way_)s
+$(odir_)%.$(way_)o : %.$(way_)s
 	@$(RM) $@
 	$(AS) $(AS_OPTS) -o $@ $<
 
-%.$(way_)o : %.c
+$(odir_)%.$(way_)o : %.c
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
 
-%.$(way_)o : %.S
+$(odir_)%.$(way_)o : %.S
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
 
-%.$(way_)s : %.c
+$(odir_)%.$(way_)s : %.c
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -S $< -o $@
 
@@ -309,5 +306,5 @@ endif
 # Preprocessor suffix rule
 
 % : %.pp
-	rm -f $@
+	@$(RM) $@
 	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@