summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-06-29 21:16:33 +0000
committerIan Lynagh <igloo@earth.li>2008-06-29 21:16:33 +0000
commitcb906a124e36cb5054784a5bc44eb9d099d20709 (patch)
tree3f253e46672708722f51373121edcd4f768517ad /libraries
parente47ddd4edb7e57b5a93a5fdd00ce18809010ee33 (diff)
downloadhaskell-cb906a124e36cb5054784a5bc44eb9d099d20709.tar.gz
Follow Cabal changes
Diffstat (limited to 'libraries')
-rw-r--r--libraries/installPackage.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 8c6600952e..65eab5664b 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -1,4 +1,5 @@
+import Data.Maybe
import Distribution.PackageDescription
import Distribution.PackageDescription.Parse
import Distribution.ReadE
@@ -8,6 +9,7 @@ import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.Program
import Distribution.Simple.Setup
import Distribution.Simple.Utils
+import Distribution.Text
import Distribution.Verbosity
import System.Environment
@@ -63,7 +65,8 @@ doInstall verbosity ghcpkg ghcpkgconf destdir topdir
pd_reg = if packageName pd == PackageName "ghc-prim"
then case library pd of
Just lib ->
- let ems = "GHC.Prim" : exposedModules lib
+ let ems = fromJust (simpleParse "GHC.Prim")
+ : exposedModules lib
lib' = lib { exposedModules = ems }
in pd { library = Just lib' }
Nothing ->