[commit: ghc] wip/nfs-locking: Fix wrapper build (090e00a)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:58:34 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/090e00af68efad88b82ae94e8f7a3a97375b6054/ghc
>---------------------------------------------------------------
commit 090e00af68efad88b82ae94e8f7a3a97375b6054
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Tue Aug 29 00:46:19 2017 +0100
Fix wrapper build
See #403
>---------------------------------------------------------------
090e00af68efad88b82ae94e8f7a3a97375b6054
src/Rules/Program.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Rules/Program.hs b/src/Rules/Program.hs
index c8a725e..b13f8a2 100644
--- a/src/Rules/Program.hs
+++ b/src/Rules/Program.hs
@@ -17,7 +17,7 @@ import Utilities
-- TODO: Drop way in build rule generation?
buildProgram :: [(Resource, Int)] -> Context -> Rules ()
buildProgram rs context at Context {..} = when (isProgram package) $ do
- let installStage = do
+ let installStage = if package == ghc then return stage else do
stages <- installStages package
case stages of
[s] -> return s
@@ -33,7 +33,7 @@ buildProgram rs context at Context {..} = when (isProgram package) $ do
-- Some binaries in inplace/bin are wrapped
inplaceBinPath -/- programName context <.> exe %> \bin -> do
context' <- programContext stage package
- binStage <- if package == ghc then return stage else installStage
+ binStage <- installStage
buildBinaryAndWrapper rs (context' { stage = binStage }) bin
inplaceLibBinPath -/- programName context <.> exe %> \bin -> do
More information about the ghc-commits
mailing list