[commit: ghc] wip/nfs-locking: Don't run GHC -M concurrently with ghc-pkg. (44fd16d)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/44fd16dbaabe96205c493952930da708e774febd/ghc

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

commit 44fd16dbaabe96205c493952930da708e774febd
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Feb 6 14:53:29 2016 +0000

    Don't run GHC -M concurrently with ghc-pkg.
    
    See #205.


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

44fd16dbaabe96205c493952930da708e774febd
 src/Rules/Dependencies.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Rules/Dependencies.hs b/src/Rules/Dependencies.hs
index 92ac8db..30a5232 100644
--- a/src/Rules/Dependencies.hs
+++ b/src/Rules/Dependencies.hs
@@ -10,7 +10,7 @@ import Development.Shake.Util (parseMakefile)
 
 -- TODO: simplify handling of AutoApply.cmm
 buildPackageDependencies :: Resources -> PartialTarget -> Rules ()
-buildPackageDependencies _ target @ (PartialTarget stage pkg) =
+buildPackageDependencies rs target @ (PartialTarget stage pkg) =
     let path      = targetPath stage pkg
         buildPath = path -/- "build"
         dropBuild = (pkgPath pkg ++) . drop (length buildPath)
@@ -29,7 +29,8 @@ buildPackageDependencies _ target @ (PartialTarget stage pkg) =
             need srcs
             if srcs == []
             then writeFileChanged out ""
-            else build $ fullTarget target (GhcM stage) srcs [out]
+            else buildWithResources [(resPackageDb rs, 1)] $
+                fullTarget target (GhcM stage) srcs [out]
             removeFileIfExists $ out <.> "bak"
 
         -- TODO: don't accumulate *.deps into .dependencies