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:
f98b4da
)
Only add the extra Windows libraries if we are on Windows
author
Ian Lynagh
<igloo@earth.li>
Mon, 4 Jun 2007 13:47:14 +0000
(13:47 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Mon, 4 Jun 2007 13:47:14 +0000
(13:47 +0000)
libraries/installPackage.hs
patch
|
blob
|
history
diff --git
a/libraries/installPackage.hs
b/libraries/installPackage.hs
index
d42bf8c
..
14069e8
100644
(file)
--- a/
libraries/installPackage.hs
+++ b/
libraries/installPackage.hs
@@
-8,6
+8,7
@@
import Distribution.Simple.Utils
import Distribution.Verbosity
import System.Cmd
import System.Environment
import Distribution.Verbosity
import System.Cmd
import System.Environment
+import System.Info
main :: IO ()
main = do args <- getArgs
main :: IO ()
main = do args <- getArgs
@@
-44,7
+45,8
@@
doit pref ghcpkg verbosity =
lbi <- getPersistBuildConfig
let -- XXX These are almighty hacks, shadowing the base
-- Setup.hs hacks
lbi <- getPersistBuildConfig
let -- XXX These are almighty hacks, shadowing the base
-- Setup.hs hacks
- extraExtraLibs = if pkgName (package pd) == "base"
+ extraExtraLibs = if (os == "mingw32") &&
+ (pkgName (package pd) == "base")
then ["wsock32", "msvcrt", "kernel32",
"user32", "shell32"]
else []
then ["wsock32", "msvcrt", "kernel32",
"user32", "shell32"]
else []