[commit: ghc] wip/nfs-locking: Fix performance bug: Stage0 packages do not depend on inplaceLibCopyTargets (17be7a1)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:59:33 UTC 2017


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

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

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

commit 17be7a10e780a792e7082aa1f8bef0b0887957a5
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Sep 14 01:13:37 2017 +0100

    Fix performance bug: Stage0 packages do not depend on inplaceLibCopyTargets
    
    See #393


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

17be7a10e780a792e7082aa1f8bef0b0887957a5
 src/Settings/Builders/GhcCabal.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Settings/Builders/GhcCabal.hs b/src/Settings/Builders/GhcCabal.hs
index fc39637..c555bf0 100644
--- a/src/Settings/Builders/GhcCabal.hs
+++ b/src/Settings/Builders/GhcCabal.hs
@@ -6,15 +6,14 @@ import Hadrian.Haskell.Cabal
 
 import Context
 import Flavour
-import Settings.Builders.Common hiding (package)
+import Settings.Builders.Common
 
 ghcCabalBuilderArgs :: Args
 ghcCabalBuilderArgs = builder GhcCabal ? do
     verbosity <- expr getVerbosity
     top       <- expr topDirectory
-    context   <- getContext
     path      <- getBuildPath
-    when (package context /= deriveConstants) $ expr (need inplaceLibCopyTargets)
+    notStage0 ? expr (need inplaceLibCopyTargets)
     mconcat [ arg "configure"
             , arg =<< pkgPath <$> getPackage
             , arg $ top -/- path



More information about the ghc-commits mailing list