From 3fd06a108c4944f3e270288da5e82480c93c5d27 Mon Sep 17 00:00:00 2001 From: Matthias Kilian Date: Wed, 30 Sep 2009 21:26:29 +0000 Subject: [PATCH] System.Console.Terminfo isn't available when bootstrapping. --- utils/ghc-pkg/Main.hs | 4 ++-- utils/ghc-pkg/ghc.mk | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 2ddf315..952fa06 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -73,7 +73,7 @@ import System.Process(runInteractiveCommand) import qualified System.Info(os) #endif -#if !defined(mingw32_HOST_OS) && __GLASGOW_HASKELL__ >= 611 +#if !defined(mingw32_HOST_OS) && __GLASGOW_HASKELL__ >= 611 && !defined(BOOTSTRAPPING) 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 defined(mingw32_HOST_OS) || __GLASGOW_HASKELL__ < 611 +#if defined(mingw32_HOST_OS) || __GLASGOW_HASKELL__ < 611 || defined(BOOTSTRAPPING) mapM_ show_normal stack #else let diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index dccd057..6795703 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -53,6 +53,7 @@ utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main "$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \ -Wall -fno-warn-unused-imports \ -DCABAL_VERSION=$(CABAL_VERSION) \ + -DBOOTSTRAPPING \ -odir bootstrapping \ -hidir bootstrapping \ -iutils/ghc-pkg \ -- 1.7.10.4