[commit: dph] master: Fix the ghc.mk hacks to avoid build races (I think). (c3cf1de)

[Ben Lippmeier]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/dph

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c3cf1de9df5c2e7d078e9334938e508707b51de8

>---------------------------------------------------------------

commit c3cf1de9df5c2e7d078e9334938e508707b51de8
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 12 23:01:35 2011 +1000

    Fix the ghc.mk hacks to avoid build races (I think).

>---------------------------------------------------------------

 ghc.mk |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 77efc24..c7fd821 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -70,9 +70,11 @@ endif
 # The following two modules directly import Data.Array.Parallel.Unlifted, so the prim
 # library needs to be built first. 
 #
-libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/Lifted/TH/Repr.$$($1_osuf): $$(libraries/dph/dph-prim-$2_dist-install_GHCI_LIB)
+libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/Lifted/TH/Repr.$$($1_osuf): \
+	$$(libraries/dph/dph-prim-$2_dist-install_GHCI_LIB)
 
-libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/PArray/PData.$${$1_osuf} : $$(libraries/dph/dph-prim-$2_dist-install_GHCI_LIB)
+libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/PArray/PData.$${$1_osuf} : \
+	$$(libraries/dph/dph-prim-$2_dist-install_GHCI_LIB)
 endef
 
 
@@ -81,3 +83,19 @@ $(foreach way, $(GhcLibWays), $(eval $(call dph_th_deps,$(way),seq)))
 $(foreach way, $(GhcLibWays), $(eval $(call dph_th_deps,$(way),par)))
 endif
 
+
+# HACKS ***************
+# These rules are to avoid a build race when validating with >= 2 threads.
+# I don't understand what $${$1_osuf} thing we need on the left of these.
+# This whole build setup is very hard to understand. -- BL 2011/05/12. 
+#
+libraries/dph/dph-seq/dist-install/build/Data/Array/Parallel/PArray/PData.o: \
+        $$(libraries/dph/dph-prim-par_dist-install_GHCI_LIB) \
+        $$(libraries/dph/dph-prim-seq_dist-install_GHCI_LIB) \
+
+libraries/dph/dph-par/dist-install/build/Data/Array/Parallel/PArray/PData.o: \
+        $$(libraries/dph/dph-prim-par_dist-install_GHCI_LIB) \
+        $$(libraries/dph/dph-prim-seq_dist-install_GHCI_LIB) \
+
+
+