projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6015a94
)
Follow cabal configurations changes
author
Ian Lynagh
<igloo@earth.li>
Sun, 29 Jul 2007 11:07:11 +0000
(11:07 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 29 Jul 2007 11:07:11 +0000
(11:07 +0000)
libraries/installPackage.hs
patch
|
blob
|
history
diff --git
a/libraries/installPackage.hs
b/libraries/installPackage.hs
index
5c83e7a
..
060ba79
100644
(file)
--- 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
import Distribution.Simple.Configure
import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Utils
import Distribution.Verbosity
import System.Environment
import Distribution.Verbosity
import System.Environment
-import System.Info
main :: IO ()
main = do args <- getArgs
main :: IO ()
main = do args <- getArgs
@@
-39,27
+37,15
@@
doit pref ghcpkg verbosity =
regWithHcPkg = Just ghcpkg,
regVerbose = verbosity
}
regWithHcPkg = Just ghcpkg,
regVerbose = verbosity
}
- pdFile <- defaultPackageDesc verbosity
- pd <- readPackageDescription verbosity pdFile
lbi <- getPersistBuildConfig
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
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 {
in lib {
- exposedModules = ems,
- libBuildInfo = lib_bi'
+ exposedModules = ems
}
Nothing ->
error "Expected a library, but none found"
}
Nothing ->
error "Expected a library, but none found"