Commit f314da8e authored by Simon Marlow's avatar Simon Marlow
Browse files

Fix build on Windows

parent 33e51a3a
......@@ -73,7 +73,7 @@ import System.Process(runInteractiveCommand)
import qualified System.Info(os)
#endif
#if __GLASGOW_HASKELL__ >= 611
#if !defined(mingw32_HOST_OS) && __GLASGOW_HASKELL__ >= 611
import System.Console.Terminfo as Terminfo
#endif
......@@ -845,7 +845,7 @@ listPackages verbosity my_flags mPackageName mModuleName = do
if simple_output then show_simple stack else do
#if __GLASGOW_HASKELL__ < 611
#if defined(mingw32_HOST_OS) || __GLASGOW_HASKELL__ < 611
mapM_ show_normal stack
#else
let
......
......@@ -82,7 +82,10 @@ $(eval $(call clean-target,utils/ghc-pkg,dist,\
utils/ghc-pkg_dist-install_PROG = ghc-pkg
utils/ghc-pkg_dist-install_MODULES = Main Version
utils/ghc-pkg_dist-install_DEPS = Cabal terminfo bin-package-db
utils/ghc-pkg_dist-install_DEPS = Cabal bin-package-db
ifeq "$(Windows)" "NO"
utils/ghc-pkg_dist-install_DEPS += terminfo
endif
utils/ghc-pkg_dist-install_SHELL_WRAPPER = YES
utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER = YES
utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER_NAME = ghc-pkg-$(ProjectVersion)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment