From: Ian Lynagh Date: Sun, 29 Jun 2008 21:17:07 +0000 (+0000) Subject: Follow Cabal changes X-Git-Tag: 6_10_branch_has_been_forked~8 X-Git-Url: http://git.megacz.com/?p=ghc-prim.git;a=commitdiff_plain;h=b06a625e0b602a5c0a6f67d1b7b6b1666b2eeb7a Follow Cabal changes --- diff --git a/Setup.hs b/Setup.hs index aedd52b..0322363 100644 --- a/Setup.hs +++ b/Setup.hs @@ -5,10 +5,12 @@ module Main (main) where import Control.Monad import Data.List +import Data.Maybe import Distribution.PackageDescription import Distribution.Simple import Distribution.Simple.LocalBuildInfo import Distribution.Simple.Utils +import Distribution.Text import System.Cmd import System.FilePath import System.Exit @@ -42,7 +44,7 @@ addPrimModuleToPD :: PackageDescription -> PackageDescription addPrimModuleToPD pd = 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 ->