update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

[ghc-hetmet.git] / rules / hs-suffix-rules-srcdir.mk

diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk
index a08fac7..bdb9d00 100644 (file)
--- a/rules/hs-suffix-rules-srcdir.mk
+++ b/rules/hs-suffix-rules-srcdir.mk
@@ -16,24 +16,21 @@ define hs-suffix-rules-srcdir
 
 # Preprocessing Haskell source
 
+ifneq "$$(BINDIST)" "YES"
+
 ifneq "$$(BootingFromHc)" "YES"
 
-$1/$2/build/%.hs : $1/$4/%.ly $$(MKDIRHIER)
-       "$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%.hs : $1/$4/%.ly | $$$$(dir $$$$@)/.
        "$$(HAPPY)" $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
 
-$1/$2/build/%.hs : $1/$4/%.y $$(MKDIRHIER)
-       "$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%.hs : $1/$4/%.y | $$$$(dir $$$$@)/.
        "$$(HAPPY)" $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
 
-$1/$2/build/%.hs : $1/$4/%.x $$(MKDIRHIER)
-       "$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%.hs : $1/$4/%.x | $$$$(dir $$$$@)/.
        "$$(ALEX)" $$($1_$2_$3_ALL_ALEX_OPTS) $$< -o $$@
 
-$1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs : $1/$4/%.hsc $$(HSC2HS_INPLACE)
-       "$$(MKDIRHIER)" $$(dir $$@)
+$1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs : $1/$4/%.hsc $$(HSC2HS_INPLACE) | $$$$(dir $$$$@)/.
        "$$(HSC2HS_INPLACE)" $$($1_$2_$3_ALL_HSC2HS_OPTS) $$< -o $$@
-       touch $$(patsubst %.hsc,%_hsc.c,$$<)
 
 # Compiling Haskell source
 
@@ -54,12 +51,11 @@ endif
 # XXX: for some reason these get used in preference to the direct
 # .hs->.o rule, I don't know why --SDM
 
-$1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h $$(MKDIRHIER)
-       "$$(MKDIRHIER)" $$(dir $$@)
-       "$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
+$1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h | $$$$(dir $$$$@)/.
+       "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h
-       "$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
+       "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 
 # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc
 #      "$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
@@ -91,5 +87,7 @@ $1/$2/build/%_stub.$$($3_osuf): $1/$2/build/%.$$($3_osuf)
        @:
 endif
 
+endif
+
 endef