[commit: ghc] wip/nfs-locking: Update GhcPkg.hs (6dbe055)

[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/6dbe055462a3d943ade75da94f3e1d8f42d23d0d/ghc

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

commit 6dbe055462a3d943ade75da94f3e1d8f42d23d0d
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Fri Jan 1 14:31:07 2016 +0800

    Update GhcPkg.hs
    
    - Fix package conf path.
    - Adds comment
    - Drops the left over comments from previous.


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

6dbe055462a3d943ade75da94f3e1d8f42d23d0d
 src/Rules/Wrappers/GhcPkg.hs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Rules/Wrappers/GhcPkg.hs b/src/Rules/Wrappers/GhcPkg.hs
index 3f70617..3e077ac 100644
--- a/src/Rules/Wrappers/GhcPkg.hs
+++ b/src/Rules/Wrappers/GhcPkg.hs
@@ -4,17 +4,14 @@ import Base
 import Expression
 import Oracles
 
--- Note about wrapper:
--- bindir is usually GhcSourcePath / inplace / bin
--- topdir is usually GhcSourcePath / inplace / lib
--- datadir is usually the same as topdir
-
 ghcPkgWrapper :: FilePath -> Expr String
 ghcPkgWrapper program = do
     lift $ need [sourcePath -/- "Rules/Wrappers/GhcPkg.hs"]
     top   <- getSetting GhcSourcePath
     stage <- getStage
-    let pkgConf = top -/- packageConfiguration stage
+    -- Use the package configuration for the next stage in the wrapper.
+    -- The wrapper is generated in StageN, but used in StageN+1.
+    let pkgConf = top -/- packageConfiguration (succ stage)
     return $ unlines
         [ "#!/bin/bash"
         , "exec " ++ (top -/- program)