diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-05-14 12:41:21 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-05-15 10:18:02 +0200 |
| commit | 2dd80f6913d05e0b170e4ab39d3fbf6fb6a8bf2f (patch) | |
| tree | d37df7fb90e9a5596884304246fcbba450db1e8e /ghc | |
| parent | d4aa4e4244bb4b2b902941bf2cbea864abd74ea5 (diff) | |
| download | haskell-2dd80f6913d05e0b170e4ab39d3fbf6fb6a8bf2f.tar.gz | |
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@gnu.org>
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GhciMonad.hs | 1 | ||||
| -rw-r--r-- | ghc/InteractiveUI.hs | 1 | ||||
| -rw-r--r-- | ghc/Main.hs | 1 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 18 |
4 files changed, 15 insertions, 6 deletions
diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs index a4abe322d2..8f429c53f0 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 b41c2db45a..3f93972d76 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 fcb9bd15a1..86f1af3f9c 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 5b40e259d2..dcbc695675 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 |