diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-07-29 11:07:11 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-07-29 11:07:11 +0000 |
| commit | 3fcadd65b744424da940f90942dfef5df750919a (patch) | |
| tree | 64b6a688ccf188940ae455bbba3f1fcaec1b1c30 | |
| parent | 6015a94f9108a502150565577b66c23650796639 (diff) | |
| download | haskell-3fcadd65b744424da940f90942dfef5df750919a.tar.gz | |
Follow cabal configurations changes
| -rw-r--r-- | libraries/installPackage.hs | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs index 5c83e7ac25..060ba79ff1 100644 --- a/libraries/installPackage.hs +++ b/libraries/installPackage.hs @@ -4,10 +4,8 @@ import Distribution.Setup import Distribution.Simple import Distribution.Simple.Configure import Distribution.Simple.LocalBuildInfo -import Distribution.Simple.Utils import Distribution.Verbosity import System.Environment -import System.Info main :: IO () main = do args <- getArgs @@ -39,27 +37,15 @@ doit pref ghcpkg verbosity = regWithHcPkg = Just ghcpkg, regVerbose = verbosity } - pdFile <- defaultPackageDesc verbosity - pd <- readPackageDescription verbosity pdFile lbi <- getPersistBuildConfig - let -- XXX These are almighty hacks, shadowing the base - -- Setup.hs hacks - extraExtraLibs = if (os == "mingw32") && - (pkgName (package pd) == "base") - then ["wsock32", "msvcrt", "kernel32", - "user32", "shell32"] - else [] + let pd = localPkgDescr lbi + -- XXX This is an almighty hack, shadowing the base + -- Setup.hs hack mkLib filt = case library pd of Just lib -> let ems = filter filt $ exposedModules lib - lib_bi = libBuildInfo lib - lib_bi' = lib_bi { - extraLibs = extraExtraLibs - ++ extraLibs lib_bi - } in lib { - exposedModules = ems, - libBuildInfo = lib_bi' + exposedModules = ems } Nothing -> error "Expected a library, but none found" |