From 660e5d4eb38ae58acb5e91e40124738df812b8b7 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Mon, 18 Jan 2010 19:15:32 +0100 Subject: Correct warnings with ghc-6.12 Ignore-this: a48ed095b72aedec9eeb88781ace66dc Changes include: - compatibility with base-4 or 3 (base-2 untested) by using extensible-exceptions. This adds an additional dependency for users of ghc<6.10) - list all dependencies again when -ftesting (change in Cabal-1.8.0.2) - remove unnecessary imports - suppress -fwarn-unused-do-bind, with appropriate Cabal-1.8 workaround, described here: http://www.haskell.org/pipermail/xmonad/2010-January/009554.html darcs-hash:20100118181532-1499c-5c496678ef76f2f50b43b0fc4582cfef7c237654.gz --- xmonad.cabal | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'xmonad.cabal') diff --git a/xmonad.cabal b/xmonad.cabal index 420050b..5b43a13 100644 --- a/xmonad.cabal +++ b/xmonad.cabal @@ -43,12 +43,17 @@ library XMonad.StackSet if flag(small_base) - build-depends: base < 4 && >=3, containers, directory, process, filepath + build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions else build-depends: base < 3 build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix - ghc-options: -funbox-strict-fields -Wall + if true + ghc-options: -funbox-strict-fields -Wall + + if impl(ghc >= 6.12.1) + ghc-options: -fno-warn-unused-do-bind + ghc-prof-options: -prof -auto-all extensions: CPP @@ -66,7 +71,12 @@ executable xmonad XMonad.Operations XMonad.StackSet - ghc-options: -funbox-strict-fields -Wall + if true + ghc-options: -funbox-strict-fields -Wall + + if impl(ghc >= 6.12.1) + ghc-options: -fno-warn-unused-do-bind + ghc-prof-options: -prof -auto-all extensions: CPP @@ -76,4 +86,4 @@ executable xmonad build-depends: QuickCheck < 2 ghc-options: -Werror if flag(testing) && flag(small_base) - build-depends: random + build-depends: filepath, process, directory, mtl, unix, X11, base, containers, random, extensible-exceptions -- cgit v1.2.3