summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-04-21 16:37:30 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2014-04-21 16:49:49 +0200
commite2b14c70c800363db5ccb5c3032eed8b9d7d3747 (patch)
treea392a706b6d906c0ef8e14cf5a055766815b1626
parent574ef4293b867609f2d28d85747e01f3ac0d052d (diff)
downloadhaskell-e2b14c70c800363db5ccb5c3032eed8b9d7d3747.tar.gz
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@gnu.org>
m---------libraries/Cabal0
-rw-r--r--utils/ghc-cabal/Main.hs2
2 files changed, 1 insertions, 1 deletions
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject 375cfd6650cc0360097dcd54515c97e42541af6
+Subproject 597ed8f613db327cfab958aa64da6c0f9e1ee29
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index cfd3d27990..d33652fe96 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 ()