From 12f530a1e7cbf04fd8c02ef672ad7aed0d5af586 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 25 Apr 2012 17:20:38 +0300
Subject: [PATCH] Remove ghc7 flag (#322)

---
 yesod-auth/yesod-auth.cabal |  2 --
 yesod-core/yesod-core.cabal | 23 ++++-------------------
 yesod/yesod.cabal           | 29 ++++++-----------------------
 3 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index d19bb5ca..0f5784b6 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -12,8 +12,6 @@ build-type:      Simple
 homepage:        http://www.yesodweb.com/
 description:     Authentication for Yesod.
 
-flag ghc7
-
 flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
     default: False
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 8bfb965b..4b5464de 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -44,21 +44,14 @@ flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
     default: False
 
-flag ghc7
-
 library
-    if flag(ghc7)
-        build-depends:   base              >= 4.3      && < 5
-        cpp-options:     -DGHC7
-    else
-        build-depends:   base              >= 4        && < 4.3
-
     -- Work around a bug in cabal. Without this, wai-test doesn't get built and
     -- we have a missing dependency during --enable-tests builds.
     if flag(test)
         build-depends: wai-test
 
-    build-depends:   time                  >= 1.1.4
+    build-depends:   base                  >= 4.3      && < 5
+                   , time                  >= 1.1.4
                    , yesod-routes          >= 1.0      && < 1.1
                    , wai                   >= 1.2      && < 1.3
                    , wai-extra             >= 1.2      && < 1.3
@@ -124,17 +117,9 @@ test-suite tests
     main-is: test.hs
     hs-source-dirs: test
 
-    if flag(ghc7)
-        type: exitcode-stdio-1.0
-        build-depends:   base                      >= 4.3      && < 5
-        cpp-options:     -DGHC7
-        main-is:         test.hs
-    else
-        type: exitcode-stdio-1.0
-        build-depends:   base                      >= 4        && < 4.3
-        main-is:         test.hs
     cpp-options:   -DTEST
-    build-depends: hspec >= 0.8 && < 0.10
+    build-depends: base
+                  ,hspec >= 0.8 && < 0.10
                   ,wai-test
                   ,wai
                   ,yesod-core
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 684a55ec..620e35a6 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -60,24 +60,13 @@ extra-source-files:
   scaffold/config/mongoDB.yml.cg
   scaffold/devel.hs.cg
 
-
-flag ghc7
-
-flag threaded
-    default: True
-    description: Build with support for multithreaded execution
-
 flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
     default: False
 
 library
-    if flag(ghc7)
-        build-depends:   base                  >= 4.3      && < 5
-        cpp-options:     -DGHC7
-    else
-        build-depends:   base                  >= 4        && < 4.3
-    build-depends:   yesod-core                >= 1.0      && < 1.1
+    build-depends:   base                      >= 4.3      && < 5
+                   , yesod-core                >= 1.0      && < 1.1
                    , yesod-auth                >= 1.0      && < 1.1
                    , yesod-json                >= 1.0      && < 1.1
                    , yesod-persistent          >= 1.0      && < 1.1
@@ -104,17 +93,13 @@ library
     ghc-options:     -Wall
 
 executable             yesod
-    if flag(ghc7)
-        build-depends:   base                  >= 4.3      && < 5
-        cpp-options:     -DGHC7
-    else
-        build-depends:   base                  >= 4        && < 4.3
     if os(windows)
         cpp-options:     -DWINDOWS
-    build-depends:     parsec             >= 2.1          && < 4
+    build-depends:     base               >= 4.3          && < 5
+                     , parsec             >= 2.1          && < 4
                      , text               >= 0.11         && < 0.12
                      , shakespeare-text   >= 1.0          && < 1.1
-                     , bytestring         >= 0.9.1.4  && < 0.10
+                     , bytestring         >= 0.9.1.4      && < 0.10
                      , time               >= 1.1.4
                      , template-haskell
                      , directory          >= 1.0          && < 1.2
@@ -127,9 +112,7 @@ executable             yesod
                      , filepath           >= 1.1
                      , fast-logger        >= 0.0.2        && < 0.1
                      , process
-    ghc-options:       -Wall
-    if flag(threaded)
-        ghc-options:    -threaded
+    ghc-options:       -Wall -threaded
     main-is:           main.hs
     other-modules:     Scaffolding.CodeGen
                        Scaffolding.Scaffolder