[commit: ghc] master: Convert `ghc-bin.cabal` to use others-extensions (2dd80f6)

[git at git.haskell.org]

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

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

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

commit 2dd80f6913d05e0b170e4ab39d3fbf6fb6a8bf2f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed May 14 12:41:21 2014 +0200

    Convert `ghc-bin.cabal` to use others-extensions
    
    This replaces the previous `default-extensions` by per-file declared
    `{-# LANGUAGE ... #-}` pragmas.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


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

2dd80f6913d05e0b170e4ab39d3fbf6fb6a8bf2f
 ghc/GhciMonad.hs     |  1 +
 ghc/InteractiveUI.hs |  1 +
 ghc/Main.hs          |  1 +
 ghc/ghc-bin.cabal.in | 18 ++++++++++++------
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs
index a4abe32..8f429c5 100644
--- a/ghc/GhciMonad.hs
+++ b/ghc/GhciMonad.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP, FlexibleInstances, UnboxedTuples, MagicHash #-}
 {-# OPTIONS_GHC -fno-cse -fno-warn-orphans #-}
 -- -fno-cse is needed for GLOBAL_VAR's to behave properly
 
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index b41c2db..3f93972 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP, MagicHash, NondecreasingIndentation, TupleSections #-}
 {-# OPTIONS -fno-cse #-}
 -- -fno-cse is needed for GLOBAL_VAR's to behave properly
 
diff --git a/ghc/Main.hs b/ghc/Main.hs
index fcb9bd1..86f1af3 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP, NondecreasingIndentation #-}
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 
 -----------------------------------------------------------------------------
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 5b40e25..dcbc695 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -45,11 +45,17 @@ Executable ghc
     if flag(ghci)
         CPP-Options: -DGHCI
         GHC-Options: -fno-warn-name-shadowing
-        Other-Modules: InteractiveUI, GhciMonad, GhciTags
+        Other-Modules:
+            InteractiveUI
+            GhciMonad
+            GhciTags
         Build-Depends: transformers, haskeline
-        Default-Extensions: UnboxedTuples,
-                    FlexibleInstances,
-                    TupleSections,
-                    MagicHash
+        Other-Extensions:
+            FlexibleInstances
+            MagicHash
+            TupleSections
+            UnboxedTuples
 
-    Default-Extensions: CPP, NondecreasingIndentation
+    Other-Extensions:
+        CPP
+        NondecreasingIndentation