[commit: ghc] wip/nfs-locking: Fix package registration (78878b7)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 01:22:53 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/78878b77fecd6a2e277cfcee5d2bcb3a3832e385/ghc
>---------------------------------------------------------------
commit 78878b77fecd6a2e277cfcee5d2bcb3a3832e385
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Sat Aug 12 22:27:54 2017 +0100
Fix package registration
>---------------------------------------------------------------
78878b77fecd6a2e277cfcee5d2bcb3a3832e385
src/Rules/Register.hs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Rules/Register.hs b/src/Rules/Register.hs
index 7ec8bcd..6f4f5b4 100644
--- a/src/Rules/Register.hs
+++ b/src/Rules/Register.hs
@@ -1,5 +1,7 @@
module Rules.Register (registerPackage) where
+import Hadrian.Utilities
+
import Base
import Context
import Expression
@@ -16,7 +18,7 @@ registerPackage rs context at Context {..} = when (stage <= Stage1) $ do
let confIn = pkgInplaceConfig context
dir = inplacePackageDbDirectory stage
- dir -/- pkgNameString package ++ "*.conf" %> \conf -> do
+ matchVersionedFilePath (dir -/- pkgNameString package) "conf" ?> \conf -> do
need [confIn]
buildWithResources rs $
target context (GhcPkg Update stage) [confIn] [conf]
More information about the ghc-commits
mailing list