summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-04-30 16:16:13 +0000
committerIan Lynagh <igloo@earth.li>2009-04-30 16:16:13 +0000
commit89d9257e7690fc51088858bf6f7e3fb6e8946ecc (patch)
tree50cf584234ac7b5e979e5eae821252c10a94bec6 /utils
parent91c81cc99ab1421b435be089b679be590230bf74 (diff)
downloadhaskell-89d9257e7690fc51088858bf6f7e3fb6e8946ecc.tar.gz
Fix building Haskeline on Windows
Diffstat (limited to 'utils')
-rw-r--r--utils/ghc-cabal/ghc-cabal.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs
index 3bcf76e617..c9c87649b1 100644
--- a/utils/ghc-cabal/ghc-cabal.hs
+++ b/utils/ghc-cabal/ghc-cabal.hs
@@ -14,6 +14,7 @@ import Distribution.Simple.Utils (defaultPackageDesc, withTempFile)
import Distribution.Simple.Build (writeAutogenFiles)
import Distribution.Simple.Register (writeInstalledConfig)
import Distribution.Simple.PackageIndex
+import Distribution.System
import Distribution.Text
import Distribution.Verbosity
import qualified Distribution.InstalledPackageInfo as Installed
@@ -170,7 +171,8 @@ generate config_args distdir directory
-- Sigh, haskeline proper uses stuff in Setup.hs to handle whether
-- or not -liconv is used. We don't use Setup.hs, so we replicate
-- what it does here. We should do this better somehow.
- when (display (pkgName (package pd0)) == "haskeline") $
+ when ((display (pkgName (package pd0)) == "haskeline") &&
+ (buildOS /= Windows)) $
case library pd0 of
Nothing -> fail "Can't happen: No haskeline library"
Just lib -> do