[commit: ghc] wip/nfs-locking: Add support for BUILD_GHCI_LIB field of package-data.mk. (85808dd)
git at git.haskell.org
git at git.haskell.org
Thu Oct 26 23:16:47 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/85808dd149afdb17d34f9e877029bc8c50020b63/ghc
>---------------------------------------------------------------
commit 85808dd149afdb17d34f9e877029bc8c50020b63
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Fri Aug 7 02:57:44 2015 +0100
Add support for BUILD_GHCI_LIB field of package-data.mk.
>---------------------------------------------------------------
85808dd149afdb17d34f9e877029bc8c50020b63
src/Oracles/PackageData.hs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/Oracles/PackageData.hs b/src/Oracles/PackageData.hs
index c01c87f..de9db7c 100644
--- a/src/Oracles/PackageData.hs
+++ b/src/Oracles/PackageData.hs
@@ -20,9 +20,10 @@ import qualified Data.HashMap.Strict as Map
-- PackageDataList is used for multiple string options separated by spaces,
-- such as 'path_MODULES = Data.Array Data.Array.Base ...'.
-- pkgListData Modules therefore returns ["Data.Array", "Data.Array.Base", ...]
-data PackageData = Version FilePath
- | PackageKey FilePath
- | Synopsis FilePath
+data PackageData = Version FilePath
+ | PackageKey FilePath
+ | Synopsis FilePath
+ | BuildGhciLib FilePath
data PackageDataList = Modules FilePath
| SrcDirs FilePath
@@ -51,9 +52,10 @@ askPackageData path key = do
pkgData :: PackageData -> Action String
pkgData packageData = do
let (key, path) = case packageData of
- Version path -> ("VERSION" , path)
- PackageKey path -> ("PACKAGE_KEY" , path)
- Synopsis path -> ("SYNOPSIS" , path)
+ Version path -> ("VERSION" , path)
+ PackageKey path -> ("PACKAGE_KEY" , path)
+ Synopsis path -> ("SYNOPSIS" , path)
+ BuildGhciLib path -> ("BUILD_GHCI_LIB", path)
fullKey = replaceSeparators '_' $ path ++ "_" ++ key
pkgData = path -/- "package-data.mk"
res <- askOracle $ PackageDataKey (pkgData, fullKey)
More information about the ghc-commits
mailing list