[commit: ghc] master: Use import list to hide new System.Exit.die (e2b14c7)

git at git.haskell.org git at git.haskell.org
Mon Apr 21 15:18:43 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e2b14c70c800363db5ccb5c3032eed8b9d7d3747/ghc

>---------------------------------------------------------------

commit e2b14c70c800363db5ccb5c3032eed8b9d7d3747
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Apr 21 16:37:30 2014 +0200

    Use import list to hide new System.Exit.die
    
    Soon, System.Exit will export the new `die` (see #9016) which would clash with
    Cabal's own `die` implementation. This commit provides forward-compatiblity.
    
    This also updates the Cabal submodule which requires a similiar fix.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


>---------------------------------------------------------------

e2b14c70c800363db5ccb5c3032eed8b9d7d3747
 libraries/Cabal         |    2 +-
 utils/ghc-cabal/Main.hs |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 375cfd6..597ed8f 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 375cfd6650cc0360097dcd54515c97e42541af6d
+Subproject commit 597ed8f613db327cfab958aa64da6c0f9e1ee291
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index cfd3d27..d33652f 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -28,7 +28,7 @@ import Data.Maybe
 import System.IO
 import System.Directory
 import System.Environment
-import System.Exit
+import System.Exit      (exitWith, ExitCode(..))
 import System.FilePath
 
 main :: IO ()



More information about the ghc-commits mailing list