From c87785692855f40d1507da6eb2c52ade63365479 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Jul 2016 17:08:11 -0400 Subject: fix cabal configure MIN_VERSION_base macro is not defined at cabal configure time, so check MIN_VERSION_GLASGOW_HASKELL instead. --- Utility/Exception.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Utility') diff --git a/Utility/Exception.hs b/Utility/Exception.hs index f6551b455..0ffc7103f 100644 --- a/Utility/Exception.hs +++ b/Utility/Exception.hs @@ -28,9 +28,11 @@ module Utility.Exception ( import Control.Monad.Catch as X hiding (Handler) import qualified Control.Monad.Catch as M import Control.Exception (IOException, AsyncException) -#if MIN_VERSION_base(4,7,0) +#ifdef MIN_VERSION_GLASGOW_HASKELL +#if MIN_VERSION_GLASGOW_HASKELL(7,10,0,0) import Control.Exception (SomeAsyncException) #endif +#endif import Control.Monad import Control.Monad.IO.Class (liftIO, MonadIO) import System.IO.Error (isDoesNotExistError, ioeGetErrorType) @@ -77,8 +79,10 @@ bracketIO setup cleanup = bracket (liftIO setup) (liftIO . cleanup) catchNonAsync :: MonadCatch m => m a -> (SomeException -> m a) -> m a catchNonAsync a onerr = a `catches` [ M.Handler (\ (e :: AsyncException) -> throwM e) -#if MIN_VERSION_base(4,7,0) +#ifdef MIN_VERSION_GLASGOW_HASKELL +#if MIN_VERSION_GLASGOW_HASKELL(7,10,0,0) , M.Handler (\ (e :: SomeAsyncException) -> throwM e) +#endif #endif , M.Handler (\ (e :: SomeException) -> onerr e) ] -- cgit v1.2.3