[commit: ghc] wip/nfs-locking: Drop workaround for GHC bug #11331. (8478284)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:03:17 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/84782844c149c729e5277f79ee80c8001f05c095/ghc
>---------------------------------------------------------------
commit 84782844c149c729e5277f79ee80c8001f05c095
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Tue Feb 16 02:26:08 2016 +0000
Drop workaround for GHC bug #11331.
See #174.
>---------------------------------------------------------------
84782844c149c729e5277f79ee80c8001f05c095
src/Rules/Compile.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Rules/Compile.hs b/src/Rules/Compile.hs
index 14e71ee..a52edef 100644
--- a/src/Rules/Compile.hs
+++ b/src/Rules/Compile.hs
@@ -14,7 +14,7 @@ compilePackage rs context @ (Context {..}) = do
let buildPath = targetPath stage package -/- "build"
buildPath <//> "*" <.> hisuf way %> \hi ->
- if compileInterfaceFilesSeparately && not ("//HpcParser.*" ?== hi)
+ if compileInterfaceFilesSeparately
then do
(src, deps) <- dependencies buildPath $ hi -<.> osuf way
need $ src : deps
@@ -37,7 +37,7 @@ compilePackage rs context @ (Context {..}) = do
need $ src : deps
build $ Target context (Gcc stage) [src] [obj]
else do
- if compileInterfaceFilesSeparately && "//*.hs" ?== src && not ("//HpcParser.*" ?== src)
+ if compileInterfaceFilesSeparately && "//*.hs" ?== src
then need $ (obj -<.> hisuf way) : src : deps
else need $ src : deps
buildWithResources rs $ Target context (Ghc stage) [src] [obj]
More information about the ghc-commits
mailing list